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

Error with merging

From: <pll_at_lanminds.com>
Date: 2003-02-07 21:17:17 CET

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


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
Received on Fri Feb 7 21:18:00 2003

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