[SVN-3330] Recovery from switch/update tree conflicts is too hard

• Type: Bug
• Status: Closed
• Priority: Major
• Resolution: Duplicate
• Affects Version/s: trunk
• Fix Version/s: ---
• Component/s: libsvn_wc
• Labels: tree-conflicts
• Assignee: Unassigned
• Reporter: Subversion Importer
• Created: 17/Nov/08 23:16
• Updated: 27/Oct/18 16:34
• Resolved: 18/Nov/08 01:11

Description

To resolve a tree conflict caused by an incoming deletion in update or switch,
the user has to determine what local mods caused the tree conflict, stash them
somewhere, re-run the update, and then redo the local mods (if they wish).

We'd like 'svn resolve --accept mine-full' to handle this, but need an API to
hide and restore arbitrary local mods.  

For single-file tree conflicts, we could store 'MINE' in the adm area along with
the existing text-base (and perhaps 'THEIRS', i.e., the update/switch target,
too).  In other words,  provide a more general revert command.  

For directory trees there is no corresponding revert command (it simply restarts
the update).  There's (currently) no way to stash a directory tree in the admin
area.

Original issue reported by sbutler

Issue Links

• duplicates: SVN-3322 In tree conflict info, report left/right URL@REV of the incoming change