On the tree-conflicts branch, there are now three different types of conflicts:
1. text conflicts (flagged on files)
2. property conflicts (flagged on files and directories)
3. tree conflicts (flagged on directories)
Note that 1. and 2. can happen at the same time for files,
and 2. and 3. can happen at the same time for directories.
When marking conflicts as resolved on items that have multiple conflicts,
e.g. a property and a tree conflict, users should be able to specify which
type of conflict they want to mark resolved.
Currently, the 'svn resolved' subcommand (the one in past tense) will clear
out all conflict information for the given path. If the path has both
property and tree conflicts, information about both types of conflicts
will be cleared. We cannot know if this is really the user's intent.
I'm not sure yet how the new 'svn resolve' subcommand (the one written
in present tense) will deal with such a situation. 'svn resolved'
is a subset of the functionality provided by 'svn resolve'.
See also issue #3143 and issue #3144.
http://svn.collab.net/repos/svn/branches/tree-conflicts
Bug
Major