(1) make coffee – unfortunately this does not work as Linux command yet on my machine. I should find some time to implement http://tldp.org/HOWTO/Coffee.html
(3) Connect to Moodle developers and Moodle commits Jabber rooms
(4) $ cd public_html/moodle-head
(5) $ git fetch
Download the recent commits from our git mirror of the main CVS repository.
(6) $ gitk master..origin
This gives me an overview on what happened in the code since the last time I merged.
(7) $ git checkout master && git pull
Fast-forward my local master branch so it contains the recent commits.
(8) $ git checkout fix/somebug-MDL-xxxxx
I love branching. I do every development (even a simple bug fix) on a separate branch.
(9) $git cvsexportcommit -c -p -u -v <hash>
Once the fix is committed on my branch, I export it to CVS. Thanks to my set-up everything happens really quickly. If the fix is done on a stable branch I have to move the merged-status tag manually yet in the CVS checkout, which is a bit annoying. Once we move to git (note not “If we moved to git” :-p) thing will become even easier.