Re: Merge crashes under windows

Sebastien Cevey <seb@cine7.net> writes:

> $ svn merge -r21:22 ../proto
> /usr/bin/diff3: unrecognized option `--diff-program=/usr/bin/diff'
> /usr/bin/diff3: Try `/usr/bin/diff3 --help' for more information.

Note the two lines above.

> svn: Error calling external program
> svn: svn_io_run_diff3: Error running /usr/bin/diff3: exitcode was 2,
> args were:
> in directory ., basenames:
> administracion.epl.tmp
> administracion.epl.tmp.tmp
> administracion.epl.tmp.2.tmp

[snip]

> I:\Prog Milcis\Milcis\unstable\Scripts_Admin>svn cleanupow
> svn: Problem running log
> svn: in directory
> svn: start_handler: error processing command 'merge' in

Note the absence of the "unrecognized option" message -- that's
because this is a different error. In this case the solution is
probably http://subversion.tigris.org/project_faq.html#diff3-diff

> svn: Error calling external program
> svn: svn_io_run_diff3: Error running C:\Program Files\Subversion\helpers\cygdiff\diff3.exe: exitcode was 2, args were:
> in directory ., basenames:
> Testbenchall.txt.tmp
> Testbenchall.txt.tmp.tmp
> Testbenchall.txt.tmp.2.tmp

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