[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Tree conflict detection bug/limitation

From: Mark Phippard <markphip_at_gmail.com>
Date: Mon, 16 Mar 2009 13:46:25 -0400

This may be known already. I recall that we knew there were scenarios
involving folders where TC detection has not been added yet.

The attached script shows a pretty trivial merge example where it does
not detect a TC and it seems like we should. Basically, in a branch a
file is edited and committed. In trunk, the parent folder is renamed
and committed. Now trunk is merged to the branch. No conflict is
raised, so the changes to the file on the branch would not be flagged
as needing to go into the renamed file. I think at one point we might
have talked about "replaying" the rename on the branch so that the
content was preserved, but that does not seem to be happening either.

Mark Phippard

Received on 2009-03-16 18:46:39 CET

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