Using Bazaar feature branches with a Subversion trunk
Posted by Kash Farooq on November 2, 2009
If your corporate strategy is to store source code in Subversion, but you are having merge and other Subversion problems, this is the blog post for you.
I have already listed some of the issues we were having and why we decided to move away from Subversion.
In this blog post, I’ll show how you can have a Subversion trunk but do your day-to-day development in a Bazaar feature branch.
This is all possible thanks to the Subversion plugin for Bazaar. The plugin is installed by default when you install the latest Bazaar Windows standalone package.
Here’s the example I’m going to demonstrate:
- Create a feature Bazaar branch from a subversion Trunk. This branch will be created in a shared location.
- Create a local branch this Bazaar branch.
- Work on the local branch, committing changes and pushing them back to the shared branch.
- Once the feature is complete, push changes back to the Subversion trunk.
The initial Bazaar feature branch is created in a shared location so that multiple developers can work on the feature.
First I creat a Subversion repository, and start svnserve to serve it.
svnadmin create c:\dev\svn_repo svnserve -d -r c:\dev\svn_repo
Then in another command prompt, I do a checkout:
svn checkout svn://localhost c:\dev\svn_checkout
Now I can add some sample code to this Subversion trunk and commit it back to the repository. [In my case, I added some sample code for a couple of design patterns.]
Create a shared bazaar feature branch
Now I will use the Bazaar Subversion plugin to create a Bazaar feature branch. I’ll do this in a shared location so that multiple developers can work on it.
cd c:\dev\bzr_svn_branch bzr branch svn://localhost/Observer \\my_server\bzr_branches\update_design_pattern\Observer
The Subversion plugin is automatically used as I have given a SVN URI.
If you are using a Subversion repository that is accessed via HTTP, the branch command would be:
bzr branch svn+http://webserver/Observer \\my_server\bzr_branches\update_design_pattern\Observer
You need to add “svn+” so Bazaar knows that you are not accessing a Bazaar repository via HTTP.
Create a local branch to work on
Now I can create a local branch from the shared branch. This is much like working from a Bazaar repository located on, say, a USB Drive.
cd c:\dev\bzr_branch bzr branch \\my_server\bzr_branches\update_design_pattern\Observer
This creates a local branch from the shared branch at c:\dev\bzr_branch\Observer.
You can now develop on your local branch. When you commit, you will just be committing locally.
All developers working on this feature should regularly pull from and push back to the central shared branch.
bzr pull \\my_server\bzr_branches\update_design_pattern\Observer bzr commit bzr push \\my_server\bzr_branches\update_design_pattern\Observer
Note – you only need to give the full path to the shared branch the first time you use the pull or push commands. Bazaar will remember it for subsequent pull/push commands.
Pushing back to the Subversion trunk
Once development is complete, you will want to push your shared Bazaar branch back to the Subversion trunk.
You have a number of options:
- Logon to the shared server and push back from there.
- Map a drive to the shared location so you can open a command prompt at, say, e:\.
- Pull the latest shared branch locally and push back from your there.
Whatever option you take, the commmand is simply:
cd e:\dev\bzr_branches\update_design_pattern\Observer bzr push svn://localhost/Observer
If you have renamed and moved files in your Bazaar branch, the Subversion plugin will issue the appropriate Subversion delete and add commands.
Sorry, the comment form is closed at this time.