[issue1399] External merge tool $base path includes both slashes and backslashes

Brett Percy mercurial-bugs at selenic.com
Wed Nov 26 00:15:59 CST 2008


New submission from Brett Percy <brettper at cpesys.com.au>:

I've configured an external 3-way merge tool (LVMerge) to handle LabVIEW binary
source files, and the $base path that is passed to LVMerge contains a
combination of forward and backslashes.
e.g. C:\Temp\Latest_Merge\Dialog/browse/browse.vi
paths for $other and $local are ok

Using TortoiseHg version 0.5 (Mercurial 1.0.2) on Windows XP SP3

Merge configuration is in user mercuial.ini

[merge-tools]
LVMerge.args = "C:\Program Files\National Instruments\LabVIEW 8.6\LabVIEW.exe"
"$base" "$other" "$local" "$output"
LVMerge.executable = C:\Program Files\National Instruments\Shared\LabVIEW
Merge\LVMerge.exe

[merge-patterns]
**.vi = LVMerge

----------
messages: 7993
nosy: brettper
priority: bug
status: unread
title: External merge tool $base path includes both slashes and backslashes
topic: merge, windows

____________________________________________________
Mercurial issue tracker <mercurial-bugs at selenic.com>
<http://www.selenic.com/mercurial/bts/issue1399>
____________________________________________________



More information about the Mercurial-devel mailing list