Re: diff3 error on WIndows

Karl Fogel kfogel@newton.ch.collab.net writes:

 Victor Ott victor.ott@q-dsl.de writes:
  Indeed, this trick made it!
  
  Before:
  ###########################
  $ svn merge -r1:3 .
  svn: Error calling external program
  svn: svn_io_run_diff3: Error running
  c:\programme\cygwin\bin\diff3.exe: exitcode was 2, args were:
  in directory ., basenames:
  file.cpp.tmp
  file.cpp.tmp.tmp
  file.cpp.tmp.2.tmp
  ###########################
 
 Yes, but your error message prints the expected path c:, whereas
 Roger's printed D:. Something still seems odd here...

It's the old diff3 invoking diff problem. In both cases svn appears
to have executed the diff3.exe and in both cases diff3 has failed to
find diff. The path in the error message does not refer to the
missing diff executable, it refers to the diff3 executable that was
run.

I guess both the diff3s were looking for c:/.../diff.exe and neither
found it.

-- 
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org