nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

doc/HACKING: Improve documentation of how to bump version in maint

Browse Source 
See discussion on 9553: Some of the build scripts don't like it when
you can't merge maint into release.
This commit is contained in:
Nick Mathewson 2014-05-20 15:02:35 -04:00
parent 268a117cdf
commit 29f2f7ce9a
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/HACKING
View File

@ -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 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 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.)