[tor-commits] [bridgedb/develop] Change order of git release commands.

[phw at torproject.org]

commit e9820372bfa75048d5823e4a5ee810ca0d05db48
Author: Philipp Winter <phw at nymity.ch>
Date:   Tue Jan 28 09:52:36 2020 -0800

    Change order of git release commands.
    
    * Add a reminder that we should bump the version number in CHANGELOG
      after we checked out the release branch.
    
    * Tag a new release after merging the release branch back into master,
      as it is suggested in:
      <https://nvie.com/posts/a-successful-git-branching-model/#finishing-a-release-branch>
---
 doc/HACKING.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/HACKING.md b/doc/HACKING.md
index 5993696..7e76a9b 100644
--- a/doc/HACKING.md
+++ b/doc/HACKING.md
@@ -58,10 +58,11 @@ deploy time, as of right now) means doing the following:
     $ git checkout develop
     [merge some fix/bug/feature/etc branches]
     $ git checkout -b release-0.0.2 develop
-    $ git tag -a -s bridgedb-0.0.2
+    [bump version number in CHANGELOG]
     [pip maintainance commands *would* go here, if we ever have any]
     $ git checkout master
     $ git merge -S --no-ff release-0.0.2
+    $ git tag -a -s bridgedb-0.0.2
     $ git checkout develop
     $ git merge -S --no-ff master
     $ git push <remote> master develop