[tor-commits] [tor/master] doc/HACKING: Improve documentation of how to bump version in maint

[nickm at torproject.org]

commit 29f2f7ce9af19f22187098fad6d002a6e5a46479
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue May 20 15:02:35 2014 -0400

    doc/HACKING: Improve documentation of how to bump version in maint
    
    See discussion on 9553: Some of the build scripts don't like it when
    you can't merge maint into release.
---
 doc/HACKING |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/HACKING b/doc/HACKING
index 028ba2d..c69b2a6 100644
--- a/doc/HACKING
+++ b/doc/HACKING
@@ -539,5 +539,7 @@ changelog to tor-talk or tor-announce.
 
 13) If it's a stable release, bump the version number in the maint-x.y.z
     branch to "newversion-dev", and do a "merge -s ours" merge to avoid
-    taking that change into master.
+    taking that change into master.  Do a similar 'merge -s theirs'
+    merge to get the change (and only that change) into release.  (Some
+    of the build scripts require that maint merge cleanly into release.)