Bazaar Explorer

How to use kdiff3 as a merge tool for Bazaar Explorer?

Asked by André Bachmann

I'm using Bazaar Explorer 1.1.3 with bzr 2.3.1 on Windows 7 Prof. 32 Bit.

KDiff3 is installed in C:\Program Files\KDiff3\kdiff3.exe. I want to use it to resolve conflicts, so I put this to my user config:
http://najut.org/~blackarchon/config-merge.png

But it cannot be used because of this:
http://najut.org/~blackarchon/merge-error0.png

So what can I do to use it? Or is there even a better solution to perform a three-way merge?

Question information

Language:
English Edit question
Status:
Solved
For:
Bazaar Explorer Edit question
Assignee:
No assignee Edit question
Solved by:
Alexander Belchenko
Solved:
Last query:
Last reply:
Revision history for this message
Best Alexander Belchenko (bialix) said : 		#1

Andre B. пишет:
> New question #157217 on Bazaar Explorer:
> https://answers.launchpad.net/bzr-explorer/+question/157217
>
> I'm using Bazaar Explorer 1.1.3 with bzr 2.3.1 on Windows 7 Prof. 32 Bit.
>
> KDiff3 is installed in C:\Program Files\KDiff3\kdiff3.exe. I want to use it to resolve conflicts, so I put this to my user config:
> http://najut.org/~blackarchon/config-merge.png

Try to add double quotes around the full path to your program.
Also try to replace backslashes \ with forward slashes / there.

> But it cannot be used because of this:
> http://najut.org/~blackarchon/merge-error0.png

I need to see corresponding part of .bzr.log to say more about that error.

> So what can I do to use it? Or is there even a better solution to perform a three-way merge?

We expect to have better support for external merge tools very soon.

--
All the dude wanted was his rug back

Revision history for this message
André Bachmann (andrebachmann-dd) said : 		#2

Thanks for your quick answer.
Putting the path in double quotes and replacing \ with / solves the problem.

Could you be please more specific about better support for external merge tools? What is planned?

Revision history for this message
André Bachmann (andrebachmann-dd) said : 		#3

Thanks Alexander Belchenko, that solved my question.

Revision history for this message
Alexander Belchenko (bialix) said : 		#4

Andre B. пишет:
> Could you be please more specific about better support for external
> merge tools? What is planned?

bzr 2.4 will have (the patch is already merged though) better built-in
support for different merge tools, and this will be used in new version
of qbzr as well (patch is awaiting merge). bzr-explorer is mostly based
on qbzr, that's why I'm talking about qbzr here. The problem you've seen
with kdiff3 actually happens inside qbzr.

--
All the dude wanted was his rug back

Revision history for this message
André Bachmann (andrebachmann-dd) said : 		#5

Ok, I'm looking forward to seeing this changes. :)