[SVN-3144] interactive conflict resolution does not know about tree-conflicts

• Type: Task
• Status: Closed
• Priority: Major
• Resolution: Fixed
• Affects Version/s: trunk
• Fix Version/s: 1.8.0
• Component/s: libsvn_wc
• Labels: tree-conflicts
• Assignee: Unassigned
• Reporter: Stefan Sperling
• Created: 26/Mar/08 22:57
• Updated: 27/Oct/18 16:28
• Resolved: 15/Mar/13 13:07

Description

The interactive conflict resolution functionality of 'svn resolve' and
'svn update' should either be extended to explicitly mention that it is
only about text and property conflicts, or be extended to deal with
tree-conflicts as well.

We should probably do the former as a quick fix, and then decide what we want
to do about marrying interactive conflict resolution with tree conflicts.

Issue Links

• blocks: SVN-2282 handle file delete/edit/add conflicts: tree changes and conflicts
• is depended upon by: SVN-2282 handle file delete/edit/add conflicts: tree changes and conflicts