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

Merge problems.

From: Leandro Lucarella <llucar_at_mecon.gov.ar>
Date: 2003-02-04 17:10:59 CET

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

Hi. I'm having a problem trying to make my first merge without success.
Here is the message:

$ 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

I've take a look to the manual, to the FAQs and searched in the mailing
list archives but found nothing about it except a similar problem in
Windows (in the FAQ) but I've tried the workarround without success.
Since it's my first merge, I don't know if I don't know how to use the
merge subcomand or is an svn bug.
I'm using svn version:
svn, version 0.17.1 (r4503)
   compiled Jan 26 2003, 14:09:21

Thanks!

PS: Please Cc me cause I'm not subscribed to the list.

- --
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 |
`-----------------------------------------------------------------------------'
Ronca pero no duerme.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (GNU/Linux)

iD8DBQE+P+YT7T/vBXlJp7MRArvnAKCmfMyZ4izmeYDqWFDrBJA7OkDAWgCeLfIi
/DLOj/BqpaEfPxUuSYO8xx4=
=2uf9
-----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 17:05:03 2003

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