Re: Error with merging

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
Received on Sat Feb 8 05:48:42 2003