Details
-
Bug
-
Status: Closed
-
Major
-
Resolution: Fixed
-
trunk
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.