Contents
The administrator (at the moment, this is Chris Burns), will merge changes into the trunk, from development branches. The diagram shows the administrator workflow:
The process looks something like this on the command line:
cd trunk-lp
bzr pull lp:nipy
bzr merge ../trunk-dev
bzr ci --author="user name"
# enter detailed commit message in a docstring format
bzr push lp:nipy
Please don’t do this yourself; even the core members of the development team will leave this process to the administrator.
One of the first test cases of the trunk-lp/trunk-dev branch strategy was merging the matplotlib documentation skeleton, which uses sphinx into the nipy-trunk. The summary of the process:
Matthew Brett performed this merge on his machine.
# Change to nipy source repository
cd ~/dev_trees/nipy-repo
# Update main trunk
cd lp-trunk/
bzr pull
# Download Fernando branch
bzr branch lp:~fperez/nipy/trunk-dev fp-trunk-dev
cd ..
# Build and test. # FIXME: Need a good system for doing this
#python setup.py build
#python setup.py install
#python -c "import nipy as ni; ni.test()"
# Merge Fernando branch
bzr log -r last:
bzr merge ../fp-trunk
bzr commit
# Push up to launchpad
bzr push bzr+ssh://matthew-brett@bazaar.launchpad.net/~nipy-developers/nipy/trunk --remember