Hello! Stefan Sperling schrieb am Thu, 11 Apr 2013 20:11:23 +0200:
Yes, this is an important distinction. But detection only makes sense if there is more than one way of resolution, doesn't it?
An additional aspect I forgot in my last answer: Subversion is inconsistent here when comparing textual and directory changes for the same type of operation. If I delete a line in trunk and testing (the files are identical and have of course the same ancestor) and then merge the deletion from trunk to testing, everything is OK and no conflict is raised (as discussed before). However, if I delete a _directory_ in trunk and testing (the directories are also identical and have the same ancestor) and then merge this deletion from trunk to testing, a tree conflict is raised:
! C testing/a
> local delete, incoming delete upon merge
According to your argument, this is no conflict at all, because there
is only one way of resolution -- the non-existing directory (which is
to be deleted again) remains non-existing. For whatever reason, it
_is_ seen as a (tree) conflict. Why?
Regards, Christoph
pgpbk3si3S_F_.pgp
Description: Digitale PGP-Signatur
