diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-05-16 09:13:38 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-05-16 09:14:38 -0400 |
| commit | 34552740b18b14d60ce5f6b67c77be13ca94bf14 (patch) | |
| tree | 821ce45b739d36d900146cdf38e3e54dc48a09bc | |
| parent | 0f4e661e7a740571bd81394dd302297a7c6ad030 (diff) | |
| download | tor-34552740b18b14d60ce5f6b67c77be13ca94bf14.tar tor-34552740b18b14d60ce5f6b67c77be13ca94bf14.tar.gz | |
Document that we're incrementing version numbers in maint.
(ticket 9553)
| -rw-r--r-- | doc/HACKING | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/HACKING b/doc/HACKING index 2156f7ca1..028ba2de4 100644 --- a/doc/HACKING +++ b/doc/HACKING @@ -537,3 +537,7 @@ changelog to tor-talk or tor-announce. (We might be moving to faster announcements, but don't announce until the website is at least updated.) +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. + |