[issue2347] merge program arguments garbled

[John Muir]

New submission from John Muir <john_muir at t-online.de>:

hg is for some reason not using the correct argument for the merge program.
I have attachen the output from hg version, hg showconfig and hg merge
below. 'echoargs' is just a cmd script to echo the arguments.

I 'asked' for $base $local $other -o $output
but got something like $local $base $other (and no $output at all)

Any help much appreciated...

---------- version ----------
hg version
Mercurial Distributed SCM (version 1.6.2)

------- showconfig --------
hg showconfig
read config from: C:\apps.win32\TortoiseHg\hgrc.d\Mercurial.rc
read config from: C:\apps.win32\TortoiseHg\hgrc.d\MergePatterns.rc
read config from: C:\apps.win32\TortoiseHg\hgrc.d\MergeTools.rc
read config from: c:\home\john\mercurial.ini
read config from: c:\home\john\.hgrc
read config from: C:\Documents and Settings\john\mercurial.ini
read config from: C:\Documents and Settings\john\.hgrc
::
C:\Documents and Settings\john\mercurial.ini:13:
merge-tools.echoargs.executable=/util/echoargs.cmd
C:\Documents and Settings\john\mercurial.ini:14:
merge-tools.echoargs.args=$base $local $other -o $output
C:\Documents and Settings\john\mercurial.ini:15: merge-tools.echoargs.priority=5
::
C:\Documents and Settings\john\mercurial.ini:3: ui.merge=echoargs
C:\Documents and Settings\john\mercurial.ini:4: ui.debug=true

------------ merge ----------------
hg merge
  searching for copies back to rev 1
resolving manifests
 overwrite None partial False
 ancestor 065fbc57f76d local 190b5257e1e7+ remote 8167ee29caef
 prog.txt: versions differ -> m
preserving prog.txt for resolve of prog.txt
updating: prog.txt 1/1 files (100.00%)
picked tool 'C:\util\echoargs.cmd' for prog.txt (binary False symlink False)
merging prog.txt
my prog.txt at 190b5257e1e7+ other prog.txt at 8167ee29caef ancestor
prog.txt at 065fbc57f76d
args: "C:\Temp\them\prog.txt" "c:\windows\temp\prog.txt~base.lsrchs"
"c:\windows\temp\prog.txt~other.c9zbbw"
arg 1: "C:\Temp\them\prog.txt"
arg 2: "c:\windows\temp\prog.txt~base.lsrchs"
arg 3: "c:\windows\temp\prog.txt~other.c9zbbw"
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)

----------
messages: 13459
nosy: johnmuir
priority: bug
status: unread
title: merge program arguments garbled

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