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

Re: Merge bugs

From: Ask Bjoern Hansen <ask_at_develooper.com>
Date: 2003-02-17 16:45:37 CET

On Fri, 14 Feb 2003, Ben Collins-Sussman wrote:

> This looks like a serious bug. Basically, 'svn merge' is trying to
> apply a diff within a directory that (legitimately) no longer exists
> in the wc. This shouldn't be throwing a fatal access-baton-locking
> error; instead, it should throw a simple warning and continue on.
> It's no worse than when 'patch' complains about failing to apply a
> hunk.

I just ran into this same problem (using ~0.16.1); glad to hear that
it's a bug and not me going crazy.

I tried running merge with --force, but it didn't make a difference.
Gustavo, did you find a reasonable work around?

I could not find an entry for it in the issue tracking system, did
it get written up?

 - ask

ask bjoern hansen, http://www.askbjoernhansen.com/ !try; do();
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Feb 17 16:46:21 2003

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