Integrate Bazaar Source Control with your preferred merge application
Posted by Kash Farooq on October 12, 2009
First, configure Bazaar so it knows how to launch your favourite merge tool.
Open up C:\Documents and Settings\YourUserName\Application Data\bazaar\2.0\bazaar.conf.
Now add a reference, with appropriate command line options, to a merge tool. I like Tortoise Merge, so to the DEFAULT section I added the line:
[DEFAULT] external_merge = tortoisemerge /base:%b /theirs:%o /mine:%t /merged:%r
Now open up Bazaar Explorer with the command:
Click File, then Open, and then navigate to the location of your bzr checkout/branch – i.e. to the location with the .bzr folder.
My branch contains a conflict so I see the following:
Now, let’s fix that conflict:
Click the Resolve Conflicts menu option and Bazaar explorer will launch qconflict (i.e. Bazaar explorer will issue the command “bzr qconflicts”):
Select the “Use Configured Default” check box at the bottom of the dialog and you will see the text we added earlier to the bazaar.conf file.
Now it is a simple case of highlighting the file you want to edit, and then clicking the launch button. In my case, this will fire up TortoiseMerge.
After you have fixed the conflict, right click the file to tell Bazaar (i.e. issue the “bzr resolve” command):
3 Responses to “Integrate Bazaar Source Control with your preferred merge application”
Sorry, the comment form is closed at this time.