Bazaar

No merge utility installed with Bazaar Explorer for Windows?

Asked by taa

Tried: bzr-2.1.1-setup.exe, then found a note that users should install bzr-explorer-setup-1.1.1.exe, but ran into version conflicts and it just wouldn't run. Now running bzr-2.2.1-3-setup.exe.

I was surprised when I went to resolve conflicts that no merge utility appears to be installed by default. I would think this would be a necessary component for newbies like myself who are learning to use Bazaar Explorer.

I installed kdiff3 because the tooltip for "Use Configured Default" gave me a clue for something I could try.

In bazaar.conf I have this in the [DEFAULT] section:

     external_merge = D:/Program Files/KDiff3/kdiff3.exe -o %r %t %b %o

When I click on the Launch button, I get, "Error while running merge tool (code 0)".

I came across other instances where users reported this problem, but haven't seen a solution posted yet.

Q1: Was there supposed to be a merge utility installed automatically?
Q2: What do I need to do in order to get kdiff3 to work?

Question information

Language:
English Edit question
Status:
Solved
For:
Bazaar Edit question
Assignee:
No assignee Edit question
Solved by:
taa
Solved:
Last query:
Last reply:
Revision history for this message
Launchpad Janitor (janitor) said : 		#1

This question was expired because it remained in the 'Open' state without activity for the last 15 days.

Revision history for this message
taa (taa-pobox) said : 		#2

Can anyone help with answers to these two questions?

Revision history for this message
Vincent Ladeuil (vila) said : 		#3

Q1: Was there supposed to be a merge utility installed automatically?

I don't think so.

Q2: What do I need to do in order to get kdiff3 to work?

You probably need to quote the exe:

 external_merge = "D:/Program Files/KDiff3/kdiff3.exe" -o %r %t %b %o

Revision history for this message
taa (taa-pobox) said : 		#4

Thanks for getting back to me.

If I put:

     external_merge = "D:/Program Files/KDiff3/kdiff3.exe" -o %r %t %b %o

at line 5 in the [DEFAULT] section of bazaar.conf, when I launch Bazaar Explorer I get this console message and the program terminates:

bzr: ERROR: Error(s) parsing config file C:/Documents and Settings/taa/Application Data/bazaar/2.0/bazaar.conf:
Parse error in value at line 5.

Revision history for this message
Launchpad Janitor (janitor) said : 		#5

This question was expired because it remained in the 'Open' state without activity for the last 15 days.

Revision history for this message
taa (taa-pobox) said : 		#6

bump

Revision history for this message
Timotheus Pokorra (tpokorra) said : 		#7

I had the same problem: "Error while running merge tool (code 0)"

This is how it works now for me:
external_merge = '"C:\Program Files (x86)\KDiff3\kdiff3.exe" --output "%r" "%b" "%t" "%o"'

Note the single quotes around the whole expression, which have been added when I edit the settings through the Bazaar Explorer.

Revision history for this message
taa (taa-pobox) said : 		#8

Thank you! I never would have thought the missing single quotes were the cause of the problem.

Here's what's working for me in bazaar.conf:

external_merge = '"D:/Program Files/KDiff3/kdiff3.exe" -o "%r" "%b" "%t" "%o"'