On 25/03/2010 12:13, Thomas Keller wrote: > Am 25.03.2010 10:52, schrieb Phil Hannent: > >> Hello, >> >> I just tried to pluck a revision based on the information provided here: >> >> http://www.monotone.ca/wiki/DaggyFixes/#index3h2 >> >> The pluck went perfectly and a diff proved that, however when I tried to >> commit the work I got an error: >> >> C:\mtn\elm.lynx.beta>mtn commit >> mtn: beginning commit on branch 'elm.lynx.beta' >> sh: C:cygwinbindiff3: command not found >> Error running editor 'C:\cygwin\bin\diff3' to enter log message >> mtn: misuse: edit of log message failed >> >> This was with version 0.45 in a native windows command prompt. >> > This sounds like a path escaping issue - could you check if happen to > have a MTN_MERGE or EDITOR environment variable set which points to > "C:\cygwin\bin\diff3" instead of "C:\\cygwin\\bin\\diff3"? > That nearly worked:
C:\mtn\elm.lynx.beta>mtn commit mtn: beginning commit on branch 'elm.lynx.beta' sh: C:\Program: command not found Error running editor 'C:\\Program Files\\KDiff3\\kdiff3.exe' to enter log message mtn: misuse: edit of log message failed C:\mtn\elm.lynx.beta>mtn commit mtn: beginning commit on branch 'elm.lynx.beta' sh: c:\cygwin\bin\diff3.exe: command not found Error running editor 'c:\\cygwin\\bin\\diff3.exe' to enter log message mtn: misuse: edit of log message failed What did work in the end was adding the KDiff3 location to the windows PATH variable and just having kdiff3.exe in the editor and MTN_MERGE variable. Thanks for your help Phil Hannent
signature.asc
Description: OpenPGP digital signature
_______________________________________________ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel