Tortoisemerge with Hg reports all rows as modified

Question

I would like to use TortoiseMerge with Mercurial to resolve conflicts, but it reports every line in theirsand mineas added, as if not comparing it correctly

here is my mercurial.ini:

[ui]
merge = TortoiseMerge

[merge-tools]
TortoiseMerge.executable=C:\Program Files\TortoiseSVN\bin\TortoiseMerge.exe
TortoiseMerge.args=/mine:$local /theirs:$other /base:$base -o /merged:$output

I use Hg 1.7.5

What's happening?

Update: When using KDiff or BeyondCompare, the database is always empty.

thank

Answer 1

Your setting is displayed correctly.

This is a symptom of not having a copy of the file in the base revision, in which case Mercurial acts as if the file was present but was empty.

, . , :

$ hg log -r "ancestor(p1(), p2())"

.. , :

$ hg manifest -r <rev> | grep <your file>

.., , .

"hg merge --debug" "hg update --debug", , ( /).

, Mercurial, ( ):

https://www.mercurial-scm.org/wiki/BugTracker