[tor-commits] [githax/master] Add an extra commit to each tor-next branch explaining what is in it.

[nickm at torproject.org]

commit 93e2449978665dc89bb7ac3c9fd73510bb63ecbf
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 11 20:48:33 2012 -0400

    Add an extra commit to each tor-next branch explaining what is in it.
---
 scripts/make-tor-next |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/scripts/make-tor-next b/scripts/make-tor-next
index 86652a4..2997a75 100755
--- a/scripts/make-tor-next
+++ b/scripts/make-tor-next
@@ -122,6 +122,24 @@ if bad_branches:
           logging.warn("Unable to merge branch: %s", b)
      sys.exit(1)
 
+# 2.1. Add a README.tor-next
+
+with open("README.tor-next", 'w') as f:
+     f.write("""\
+# This is tor-next, branch %s.
+#
+# It is made automatically by merging my favorite in-review branches
+# onto Tor master.  USE AT YOUR OWN RISK.
+#
+# Here are the branches I used:
+
+"""% temp_branch_name)
+     f.write( open(BRANCHLIST).read() )
+     f.write("\n")
+
+subprocess.check_call(["git", "add", "README.tor-next"])
+subprocess.check_call(["git", "commit", "-m", "README.tor-next for %s"%temp_branch_name])
+
 # 3. WILL IT STILL BUILD?
 
 logging.info("Looks okay to me.  Will it compile?")