We are currently only handling cases where files are victims of tree conflicts.
This should be extended to include directories, i.e. a tree conflict
use case carried out on a directory instead of a file should cause a
tree conflict to be flagged in the parent directory of the directory,
and the directory should be the tree conflict victim.
I'm not yet sure whether all of our use cases can be handled when
applied to directories. This issue needs investigation.
Leaving this issue unassigned for now. It certainly is a much bigger task
than the other issues we've filed for the tree-conflicts branch so far.
We should start a discussion thread on the dev@ mailing list to discuss
this issue further.
http://svn.collab.net/repos/svn/branches/tree-conflicts
Bug
Critical
SVN-2282 handle file delete/edit/add conflicts: tree changes and conflicts
