xxdiff & mercurial

Hans Meine meine at informatik.uni-hamburg.de
Thu May 8 12:53:10 UTC 2008


Hi Martin,

I am a happy mercurial user and have started evaluating xxdiff - nice tool so 
far!  Concerning your notes on: 
http://furius.ca/xxdiff/doc/xxdiff-scripts.html#mercurial-support
I have had problems with both mercurial version 0.9.5 and 1.0; my installation 
of xxdiff-3.2 does not seem to include the referenced xx-hg-merge, and the 
1.0 native support does not seem to be activated by default.

After reading Matt's response at 
http://www.selenic.com/pipermail/mercurial/2008-February/017124.html
I suggest that you add a note to the xxdiff docs that the new merge-tools 
support have to be configured like the following, if the distributor did not 
do so yet:

[merge-tools]
xxdiff.args=--show-merged-pane --exit-with-merge-status --title1 
local --title2 base --title3 other --merged-filename $output --merge $local 
$base $other
xxdiff.gui=True
xxdiff.priority=-8

Of course, feel free to adjust the priority.. ;-)
This is what I found in contrib/mergetools.hgrc (I have left out the 
configuration of other tools except xxdiff though), and it worked (yay!).

Still, I would like to know how to fine-tune this, so I was looking for  
xx-hg-merge to be able to inspect it, but it does not even seem to be 
available via the WWW?

I would be particularly interested in decision mode support, and I wonder if 
it is possible to include the revision numbers in the titles (probably a hg 
question).

-- 
Ciao, /  /
     /--/
    /  / ANS



More information about the Mercurial mailing list