[SVN-3306] "resolve" should resolve a tree conflict victim, not the parent

• Type: Bug
• Status: Closed
• Priority: Major
• Resolution: Fixed
• Affects Version/s: trunk
• Fix Version/s: 1.6.0
• Component/s: libsvn_wc
• Labels: tree-conflicts
• Assignee: Unassigned
• Reporter: Julian Foad
• Created: 30/Oct/08 13:53
• Updated: 27/Oct/18 16:34
• Resolved: 10/Mar/09 15:22

Description

"svn resolve" (and the APIs that implement it, down to
resolve_conflict_on_entry() in libsvn_wc) marks as resolved any and all tree
conflicts that are recorded in the specified target, when the target is a
directory. Instead, the target to be resolved should be interpreted as a tree
conflict victim, in line with our change to per-victim operations for all tree
conflict handling.