[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Merge problems.

From: Philip Martin <philip_at_codematters.co.uk>
Date: 2003-02-04 17:56:21 CET

Leandro Lucarella <llucar@mecon.gov.ar> 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.
> 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

It looks like your Subversion is expecting a 2.8 style GNU diff but is
finding a 2.7 one. You can set

diff3-has-program-arg = false

in your ~/.subversion/config

-- 
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Feb 4 18:23:51 2003

This is an archived mail posted to the Subversion Dev mailing list.