RE: Tree conflict after a simple delete

>

Linedata Services (UK) Ltd
Registered Office: Bishopsgate Court, 4-12 Norton Folgate, London, E1 6DB
Registered in England and Wales No 3027851 VAT Reg No 778499447

-----Original Message-----

> From: Stein Somers [mailto:ssomers_at_opnet.com]
> Sent: 23 September 2009 12:43
> To: users_at_subversion.tigris.org
> Subject: Re: Tree conflict after a simple delete
>
> Giulio Troccoli wrote:
> > am I correct in saying that you think other changes have happened
>
> Yes, to the file
> http://localhost/svn-icon/5.31/test/src/ic/ud/icudcc31.c in
> particular, after the revision that the wip branch sprouted from.

Absolutely right!!

There was another change to that file, where EOL was fixed and svn:eol-style set.

r5941 - wip/ic/ud/icudcc31.c added
r5958 - 5.31/test/src/ic/ud/icudcc31.c copied from wip
r5959 - 5.31/test/src/ic/ud/icudcc31.c EOL fixed and svn:eol-style set
r5971 - wip/ic/ud/icudcc31.c deleted

Mergin revision 5971 from wip to 5.31/test results in a tree conflict.

This is very odd as the changes should have happened in the wip branch, and that's why I didn't notice them before. I don't think that would have prevented the tree conflict anyway but that's just my fault (becuase of the current process we follow) and not Subversion's so I regard the matter as resolved (i.e. I know why the tree conflict).

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?

Giulio

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-09-23 14:18:44 CEST