Author: stsp
Date: Mon Feb 25 17:37:19 2013
New Revision: 1449786
URL: http://svn.apache.org/r1449786
Log:
Show a special conflict prompt menu for tree conflicts with local replacements.
* subversion/svn/conflict-callbacks.c
(tree_conflict_options_update_replaced): New. Doesn't differ from the
corresponding menu used with local deletions, expect for some wording.
(handle_tree_conflict): Use the new options menu.
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=1449786&r1=1449785&r2=1449786&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Mon Feb 25 17:37:19
2013
@@ -417,6 +417,21 @@ static const resolver_option_t tree_conf
{ NULL }
};
+static const resolver_option_t tree_conflict_options_update_replaced[] =
+{
+ { "p", "postpone", N_("resolve the conflict later"),
+ svn_wc_conflict_choose_postpone },
+ { "mc", "mine-conflict", N_("keep any moves affected by this
replacement"),
+ svn_wc_conflict_choose_mine_conflict },
+ { "r", "resolved", N_("mark resolved (any affected moves will "
+ "become copies)"),
+ svn_wc_conflict_choose_merged },
+ { "q", "quit", N_("postpone all remaining conflicts"),
+ svn_wc_conflict_choose_postpone },
+ { "h", "help", N_("show this help (also '?')"), -1 },
+ { NULL }
+};
+
/* Return a pointer to the option description in OPTIONS matching the
* one- or two-character OPTION_CODE. Return NULL if not found. */
@@ -876,6 +891,8 @@ handle_tree_conflict(svn_wc_conflict_res
tc_opts = tree_conflict_options_update_moved_away;
else if (desc->reason == svn_wc_conflict_reason_deleted)
tc_opts = tree_conflict_options_update_deleted;
+ else if (desc->reason == svn_wc_conflict_reason_replaced)
+ tc_opts = tree_conflict_options_update_replaced;
else
tc_opts = tree_conflict_options;
}
