Author: stsp
Date: Thu Jun 13 14:24:57 2013
New Revision: 1492682
URL: http://svn.apache.org/r1492682
Log:
Merge two very similar interactive conflict resolution menus.
* subversion/svn/conflict-callbacks.c
(tree_conflict_options_update_edit_moved_away): Merge this menu with ...
(tree_conflict_options_update_moved_away): .. this one. They weren't
sufficiently different anymore to justify the separation.
(handle_tree_conflict): Track above change.
Modified:
subversion/trunk/subversion/svn/conflict-callbacks.c
Modified: subversion/trunk/subversion/svn/conflict-callbacks.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/conflict-callbacks.c?rev=1492682&r1=1492681&r2=1492682&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Thu Jun 13 14:24:57
2013
@@ -544,25 +544,7 @@ static const resolver_option_t tree_conf
static const resolver_option_t tree_conflict_options_update_moved_away[] =
{
- { "mc", N_("apply update (recommended)"),
- N_("apply update to the move destination"
- " [mine-conflict]"),
- svn_wc_conflict_choose_mine_conflict },
- { "r", N_("discard update (breaks move)"), N_("discard update, mark "
- "resolved, the move will "
- "will become a copy"),
- svn_wc_conflict_choose_merged },
- { "p", N_("postpone"), N_("resolve the conflict later [postpone]"),
- svn_wc_conflict_choose_postpone },
- { "q", N_("quit resolution"), N_("postpone all remaining conflicts"),
- svn_wc_conflict_choose_postpone },
- { "h", N_("help"), N_("show this help (also '?')"), -1 },
- { NULL }
-};
-
-static const resolver_option_t tree_conflict_options_update_edit_moved_away[] =
-{
- { "mc", N_("apply update to move destination"),
+ { "mc", N_("apply update to move destination (recommended)"),
N_("apply incoming update to move
destination"
" [mine-conflict]"),
svn_wc_conflict_choose_mine_conflict },
@@ -1078,10 +1060,7 @@ handle_tree_conflict(svn_wc_conflict_res
{
if (desc->reason == svn_wc_conflict_reason_moved_away)
{
- if (desc->action == svn_wc_conflict_action_edit)
- tc_opts = tree_conflict_options_update_edit_moved_away;
- else
- tc_opts = tree_conflict_options_update_moved_away;
+ tc_opts = tree_conflict_options_update_moved_away;
}
else if (desc->reason == svn_wc_conflict_reason_deleted ||
desc->reason == svn_wc_conflict_reason_replaced)
