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.

diff --git a/doc/HACKING b/doc/HACKING
index 028ba2de42b123437f163c703a7615409d7d8300..c69b2a6fee9e3248459a66f026958fe5d03b13b8 100644 (file)
--- 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.)