[chronojump] Writes a way to create branches for maintenance

[Carles Pina i Estany <carlespina src gnome org>]

commit 8c0d4e1c2bcf8f681d7c2fe546f48306b99b58eb
Author: Carles Pina i Estany <carles pina cat>
Date:   Wed Jan 28 23:14:44 2015 +0000

    Writes a way to create branches for maintenance

 howto_new_version.txt |   24 ++++++++++++++++++++++++
 1 files changed, 24 insertions(+), 0 deletions(-)
---
diff --git a/howto_new_version.txt b/howto_new_version.txt
index 808ca24..a1f1833 100644
--- a/howto_new_version.txt
+++ b/howto_new_version.txt
@@ -8,16 +8,40 @@ linux stuff
 sh autogen.sh
 make dist
 
+
 VERSION=0.9.3
+[1]
 git commit -a -m "Bump version $VERSION"
 
 git push
+git checkout -b "tags/$VERSION" # creates a new branch
+# keep doing commits:
+# git commit -a
+# git commit -a
+# git cherry-pick -x "commit-from-master-or-some-branch-that-we-want-here"
+
+When we are happy:
 git tag -a "$VERSION"
 git push origin --tags
 scp "chronojump-$VERSION.tar.gz" xaviblas master gnome org:.
 ssh xaviblas master gnome org
 ftpadmin install "chronojump-$VERSION.tar.gz"
 
+Go back to master:
+git checkout master
+
+git note:
+If we want to release 0.9.4 based on an bug fix from 0.9.3:
+
+git checkout tags/0.9.3
+git checkout -b tags/0.9.4 # creates a new branch based on 0.9.3
+git cherry-pick -x "commit-from-master-or-some-branch-that-we-want-here"
+vim "fix something"
+git commit -a -m "Important fix"
+VERSION=0.9.4
+Then go to [1]
+
+
 create deb package
 -----
 1st time)