Bazaar NG workflow question - a possible solution

Nicholas Allen allen at ableton.com
Wed Oct 25 13:24:35 BST 2006


After thinking about this for a while I had the following idea as a 
possible workflow. I'm not sure what tools we would need to use here (or 
if we would have to write them ourselves) but this is how I imagine it 
could work:

Each developer works on their own branch which has a mirror (push 
location) maintained on the server.

A web server offers an html form that a developer can fill out to create 
a new branch and provide a description of what the branch does. There is 
also a web interface that lists all branches with their descriptions, 
who created it, and a link to browse it through a web interface.

The user then does "bzr branch new-branch-url" to create a local copy of 
the newly created branch.

The user works in his branch and pushes to the mirror. Occassionally 
merging the trunk into his branch. When the user pushes to the mirror an 
email is sent to all developers indicating what files were changed, with 
links to the changes that are displayed through a bzr web interface.

Once the developer wants to merge his changes to trunk there would be a 
separate web interface that let the user do this. The user would select 
the branch to merge from and the branch to merge to. The server would 
attempt the merge, check that there were no conflicts and inform all 
developers that a branch has been merged to the trunk (again with a list 
of changed files and links to the web interface). If there were 
conflicts a message would be displayed indicating that the user needs to 
merge the parent into local branch, resolve conflicts, commit and push 
and then try again.

Currently, our svn setup is quite sophisticated with keeping all 
developers up to date with changes made in branches and automatically 
flagging certain changes for different developers to review. If we use 
bzr as a replacement we would need to have the same level of communication.

Does anyone know what tools we should use, if there are any, so that we 
can have this kind of workflow?

Thanks,

Nicholas Allen






More information about the bazaar mailing list