On Thu, Apr 11, 2013 at 09:01:09PM +0200, Christoph Schulz wrote: > 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?
Delete vs. delete is not a real tree conflict. The problem here is that Subversion cannot tell apart the following cases right now because, internally, in the implementation, they all look the same: delete vs. delete rename vs. delete delete vs. rename rename vs. rename So we have to treat delete vs. delete as a tree conflict because it could be any of the other cases (which are real tree conflicts). But this has nothing to do with the file content merge we're discussing.
