You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by pl...@lanminds.com on 2003/02/07 20:17:17 UTC
Error with merging
Hi all,
I updated some files in my subversion source tree. I then went to do
an svn up, and it died with an error about:
/usr/bin/diff3: unrecognized option `--diff-program=/usr/bin/diff'
Presumably, because what I had in my wc and what were in HEAD
differed, svn wanted to do a merge and therefore call diff.
I'm not quite sure what the problem is, but now I've got my wc in a
state where it's locked, and svn cleanup isn't fixing it.
I've even tried to delete my local copies, svn revert those files,
etc. Nothin.
Any ideas?
I'm running Debian Linux with the most recent .deb of subversion:
$ svn --version
svn, version 0.17.1 (r4503)
compiled Jan 30 2003, 23:12:53
Copyright (C) 2000-2003 CollabNet.
Subversion is open source software, see http://subversion.tigris.org/
The following repository access (RA) modules are available:
* ra_dav : Module for accessing a repository via WebDAV (DeltaV) protocol.
- handles 'http' schema
- handles 'https' schema
* ra_local : Module for accessing a repository on local disk.
- handles 'file' schema
* ra_svn : Module for accessing a repository using the svn network protocol.
- handles 'svn' schema
Thanks!
--
Seeya,
Paul
--
Key fingerprint = 1660 FECC 5D21 D286 F853 E808 BB07 9239 53F1 28EE
It may look like I'm just sitting here doing nothing,
but I'm really actively waiting for all my problems to go away.
If you're not having fun, you're not doing it right!
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Error with merging
Posted by Paul Lussier <pl...@lanminds.com>.
In a message dated: Fri, 07 Feb 2003 20:44:07 PST
David Kimdon said:
>> I've even tried to delete my local copies, svn revert those files,
>> etc. Nothin.
>
>That is strange that svn cleanup isn't working for you. Do you get
>errors when you run it or when you run svn revert?
Yes, I got the same --diff-program=/usr/bin/diff error as above
(IIRC, that was Friday, and now it's Monday:)
I've since rm -rf'ed the entire sub-tree, and svn up'ed since.
Thanks,
--
Seeya,
Paul
--
Key fingerprint = 1660 FECC 5D21 D286 F853 E808 BB07 9239 53F1 28EE
It may look like I'm just sitting here doing nothing,
but I'm really actively waiting for all my problems to go away.
If you're not having fun, you're not doing it right!
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Error with merging
Posted by David Kimdon <dw...@debian.org>.
On Fri, Feb 07, 2003 at 03:17:17PM -0500, pll@lanminds.com wrote:
>
>
> Hi all,
>
> I updated some files in my subversion source tree. I then went to do
> an svn up, and it died with an error about:
>
> /usr/bin/diff3: unrecognized option `--diff-program=/usr/bin/diff'
Hi,
Take a look at ~/.subversion/config
specifically the diff3-has-program-arg option.
> Presumably, because what I had in my wc and what were in HEAD
> differed, svn wanted to do a merge and therefore call diff.
> I'm not quite sure what the problem is, but now I've got my wc in a
> state where it's locked, and svn cleanup isn't fixing it.
>
> I've even tried to delete my local copies, svn revert those files,
> etc. Nothin.
That is strange that svn cleanup isn't working for you. Do you get
errors when you run it or when you run svn revert?
-David
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org