On Tue, May 11, 2010 at 03:53:20PM +0100, Philip Martin wrote: > (4) This is deliberate Subversion policy as Subversion cannot > distinguish between simple deletes and deletes that are part of a > move. It's debatable whether this behaviour is correct, but it is > deliberate.
This is a problem with the current implementation. Subversion does not currently know the difference between an incoming rename and an incoming delete. The options were to either flag no conflicts when renames are involved, or flag false positive delete vs. delete conflicts. We chose the latter. > These conflicts are explicitly marked as delete-delete > conflicts so you should be able to detect and resolve them, perhaps > using a post-merge script. Any delete-delete conflict could be a rename-delete, rename-rename, or a delete-rename conflict. It's currently up to the user to find out which of these happened. Blindly marking all delete vs. delete conflicts resolved is wrong (unless you don't care about rename conflicts). Stefan
