Diff is using mixed path types
Ton Plomp
tcplomp at gmail.com
Wed Dec 28 23:15:37 UTC 2011
Hi all,
I recently upgraded from 1.9 to 2.0.1 (Mercurial and TortoiseHG).
I noticed that my diff tool wasn't working anymore, closer inspection shows
that the $parent directive was using mixed path separators.
for instance:
c:\temp\thg.q0hewt\lvccttool.3.324\Trunk/Source/_code....
What so everything inside the repo uses linux-style path separators, while
the rest of the path (and that of the current revision) have windows style
separators.
(an image is stored at:
https://bitbucket-assetroot.s3.amazonaws.com/AndreasS/mercurial-labview-integration/1325112272.31/5/LVdiff2slashissue.png?Signature=7hHrX%2FB1ltuRUPE8i2wI8PYsDoM%3D&Expires=1325115456&AWSAccessKeyId=0EMWEFSGA12Z1HF1TZ82
I'm sure that I didn't alter the mercurial.ini and that the string is
provided by TortoiseHG upon calling the diff-tool.
Here's the ini-section:
[merge-tools]
lvdiff.diffargs = $child $parent
lvdiff.executable = C:\Program Files\lvdiff2\lvdiff2.exe
lvdiff.gui = True
lvdiff.binary = True
Is this by design?
Ton
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20111229/a1f643a2/attachment-0002.html>
More information about the Mercurial
mailing list