Re: Tree conflict after a simple delete

On Wed, Sep 23, 2009 at 01:17:24PM +0100, Giulio Troccoli wrote:
> One last questions though. Does the tree conflict happen because the
> file is deleted? If the files was simply modified, would Subversion
> merge it? Would it give a text conflict?

Yes. Tree conflicts are only flagged if a structural change is involved,
such as copy, move, add, or delete. Otherwise you get text conflicts,
given that conflicting changes were made to the file's content.

You can think of tree conflicts as happening at the level of the tree
structure. They regard file content only to find out if two files are
equal, to answer questions such as "does the file I am about to remove
look like what I expect to be removing?".

Text and property conflicts are only concerned with file content.
I.e. you will never see a tree conflict saying "edit vs. edit" on
files. Though "edit" is possible for directories meaning that
directory content was changed.

Stefan

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2398879

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-09-23 15:11:35 CEST