[Monotone-devel] Can't merge in Monotone on WinXP

[Benjamin Place]

Hi,

I love Monotone, it's made my life easier and it makes sense, unlike SVN.

But I can't merge on Windows.

Can you help me? Does it require Cygwin? I've look through the
monontone-devel mailing list archives, but everything I saw there was
for Cygwin.

I'm sure it's something simple I'm not doing. At the end of this
message you'll find my commands and the output.

Thanks,
Ben


Windows XP Pro SP2, no cygwin. I've set %MTN_MERGE% to "C:\Program
Files\TortoiseSVN\bin\TortoiseMerge.exe", "C:\Program
Files\TortoiseSVN\bin", "C:\Kdiff3", "C:\Kdiff3\kdiff3.exe" with no
better results.

C:\Documents and Settings\ben\workspace>mtn --version
monotone 0.36 (base revision: e4bc808d89e029ce623f9e8f2b10c84006b83fb5)

C:\Documents and Settings\ben\workspace>mtn propagate
mypath.myproj.port_branch mypath.myproj.trunk
mtn: propagating mypath.myproj.port_already_bound -> mypath.myproj.trunk
mtn: [source] fdf17f2dd9f41c223f83fae6abf2519f4fead0e0
mtn: [target] 03ee7400c4117927d46ecbfa49928417a42b52de
mtn: help required for 3-way merge
mtn: [ancestor] myprojLib/src/mypath/myproj/Constants.java
mtn: [    left] myprojLib/src/mypath/myproj/Constants.java
mtn: [   right] myprojLib/src/mypath/myproj/Constants.java
mtn: [  merged] myprojLib/src/mypath/myproj/Constants.java
The possible commands for the "C:\Program
Files\TortoiseSVN\bin\TortoiseMerge.exe" merger aren't available. You
may want to check that $MTN_MERGE or the lua variable `merger' is set
to something available.  If you want to use vim or emacs, you can also
set $EDITOR to something appropriatemtn: error: merge failed due to
unresolved conflicts

C:\Documents and Settings\ben\workspace>echo %MTN_MERGE%
"C:\Program Files\TortoiseSVN\bin\TortoiseMerge.exe"

C:\Documents and Settings\ben\workspace>echo %PATH%
"c:\Program 
Files\Java\jre1.5.0_13\bin";C:\oracle\ora92\bin;C:\GNAT\2007\bin;"c:\documents
and 
settings\ben\bin";C:\WINNT\system32;C:\WINNT;C:\Merant\DIMENS~1\8.0\PROG;C:\WINNT\System32\Wbem;"C:\Program
Files\monotone";"C:\Program Files\
TortoiseSVN\bin";C:\j2sdk1.4.2_15\bin;"C:\Program
Files\Oracle\jre\1.3.1\bin";"C:\Program
Files\Oracle\jre\1.1.8\bin";C:\Kdiff3