[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: Greg Hudson <ghudson_at_MIT.EDU>
Date: 2006-03-21 18:43:17 CET

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? :)

This changed in r13222 in fs_fs and in r15569 in fs_base, when the merge
algorithm was rewritten to take advantage of the "new" (pre-1.0) commit
system which uses a proper merge ancestor.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Mar 21 18:44:23 2006

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