[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: Leandro Lucarella <llucar_at_mecon.gov.ar>
Date: 2003-02-04 18:25:48 CET

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Philip Martin, el martes 4 de febrero a las 16:56 me escribiste:
> 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

Mmm, nice. I've tried the config option and now I've updated to diff 2.8
and both works just fine!

Thanks a lot!

- --
Leandro Lucarella @ MEcon .-----------------------------.
                                               / Powered by Debian GNU/Linux |
.-----------------------------------------------------------------------------|
| GPG Key: http://bal748.mecon.ar/~luca/public_key.gpg |
| GPG Key Fingerprint: 716E 4896 93B2 640D 917D 96D8 4B16 3177 C864 D90B |
`-----------------------------------------------------------------------------'
Ser natural es la mas difícil de las poses.
                -- Oscar Wilde. (1854-1900) Escritor irlandés.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (GNU/Linux)

iD8DBQE+P/ec7T/vBXlJp7MRArClAJ9dFR6CXZR2wl8tfOHKz2pVn3GLLQCfSHj5
8qf0StqeOQmFrWzrMI/dWGU=
=ZOce
-----END PGP SIGNATURE-----

---------------------------------------------------------------------
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:20:10 2003

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