[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-20 14:57:47 CET

On 3/20/06, Kamesh Jayachandran <kamesh@collab.net> wrote:
> Hi Sussman,
> If it is a expected behaviour, this doc should be wrong.
> subversion/libsvn_fs_base/notes/structure under 'Merging algorithm' section.
> "If SOURCE-ENTRY and TARGET-ENTRY are both null, that's a
> double delete; flag a conflict."

Take a look at fs.c:merge(). Double-deletes are not considered a
conflict, they're considered automatically mergeable.

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Mar 20 14:58:49 2006

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