Danil Shopyrin danil a@t visualsvn.com


Inspired
r1491762

r1491762 | stsp | 2013-06-11 07:08:07 -0500 (Tue, 11 Jun 2013)

In the interactive conflict prompt menu, tweak the tree conflict options
to better explain the effects of available options.

Inspired by: ivan
             Danil Shopyrin danil a@t visualsvn.com

* subversion/svn/conflict-callbacks.c
  (tree_conflict_options_update_moved_away): Change option labels for clarity:
    'my side of conflict' -> 'apply update (recommended)'
    'mark resolved' -> 'discard update (breaks move)'
  (tree_conflict_options_update_edit_moved_away): New. Specific menu for
    the case where the incoming change is an edit, rather than an addition,
    a deletion, etc.
  (tree_conflict_options_update_deleted,
   tree_conflict_options_update_replaced): Change option labels for clarity:
    'my side of conflict' -> 'keep affected local moves'   
    'mark resolved' -> 'mark resolved (breaks moves)'
  (handle_tree_conflict): Use the special 'edit_moved_away' menu for conflicts
   involving local moves vs. incoming edits.