KDiff3 problem

Benoit Boissinot bboissin at gmail.com
Wed Nov 16 09:16:30 UTC 2005


On 11/15/05, Mirza <mirza at seznam.cz> wrote:
> I tried to use (latest) KDiff3 on both Windows and Linux Mercurial
> version. On Linux everything is OK but on Windows I have following problem:
>
> 1. I Clone repo to some "other" dir.
> 2. Change files in both repos.
> 3. Pull "other" repo changes back.
> 4. hg update -m
>
> kdiff is launched, but result of merging is saved to some temporary
> file, instead of current repo (as in Linux). In the end current repo is
> left unchanged, of course.
>
> Any idea?
>
some questions first:
how is kdiff3 called ? is hgmerge set to kdiff3 or do you use the
hgmerge helper ?
if you call kdiff3 directly,  the correct way to do it is to write a
script to change the order of the arguments:
hgmerge is called:
hgmerge "local" "base" "other"
whereas kdiff3 should be called like:
kdiff3 "base" "local" "other" -m
or
kdiff3 "base" "local" "other" -o "output"

regards,

Benoit




More information about the Mercurial mailing list