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

Re: Delete of a file/folder from 2 working copies

From: Ben Collins-Sussman <sussman_at_red-bean.com>
Date: 2006-03-21 20:42:32 CET

On 3/21/06, Greg Hudson <ghudson@mit.edu> wrote:
> On Mon, 2006-03-20 at 07:57 -0600, Ben Collins-Sussman wrote:
> > Take a look at fs.c:merge(). Double-deletes are not considered a
> > conflict, they're considered automatically mergeable.
>
> merge is defined in tree.c, not fs.c, in both back ends. Both back ends
> flag a conflict on double deletes. Did you do your own suggested
> research? :)

Dang, here I was, all proud of my memories of libsvn_fs extending back
to 2001. And now you tell me it was changed a year ago! I suppose I
should stop assuming that subversion is invariant. :)

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Mar 21 20:42:56 2006

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