diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-05-20 15:02:35 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-05-20 15:02:35 -0400 |
| commit | 29f2f7ce9af19f22187098fad6d002a6e5a46479 (patch) | |
| tree | d7391f2a5e406337f5299be4375e8cb29dd91689 /doc/HACKING | |
| parent | 268a117cdf5e58da81fd9ece925c1b963f4c1ecb (diff) | |
| download | tor-29f2f7ce9af19f22187098fad6d002a6e5a46479.tar tor-29f2f7ce9af19f22187098fad6d002a6e5a46479.tar.gz | |
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.
Diffstat (limited to 'doc/HACKING')
| -rw-r--r-- | doc/HACKING | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/HACKING b/doc/HACKING index 028ba2de4..c69b2a6fe 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.) |