Steps for Releasing New Dabo Version

1. Make sure local repository is up-to-date:

cd dabo
git checkout working
git pull
git checkout master
git pull

1. Create a new local branch based on 'master'

git checkout master
git checkout -b release

1. Merge desired changes from 'working' into 'release'

git merge --squash working

1. Run tests

2. When 'release' looks right, merge from 'release' into 'master'

git commit
git checkout master
git merge release
git log

1. Edit RELEASENOTES.md with the notes from the git log above.

2. Bump __version__ in dabo/dabo/version.py

3. Re-Run tests

• git reset --hard to cancel and start over if necessary

1. Commit.

git commit -a

1. Tag with bumped version

git tag -a -m "Version 0.9.7" v0.9.7

1. Push it:

git push --tags origin master

1. Merge last commit into master back into working (version number/log). Don't rebase because it causes lots of conflicts.

git checkout working
git merge master HEAD~1

1. Merge any commits from 'release' that were cherry-picked out of the merge into 'master' back into 'working', and delete the 'release' branch:

git merge release
git push origin working
git branch -D release

1. Announce the new release:

cd ~/dabowebsite/trunk/blog/Announcements
touch Dabo_<version>.txt
svn add *.txt
svn ci -m 'new version announcement'