subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1492152 - /subversion/trunk/subversion/svn/conflict-callbacks.c
Date Wed, 12 Jun 2013 11:33:10 GMT
Author: stsp
Date: Wed Jun 12 11:33:09 2013
New Revision: 1492152

URL: http://svn.apache.org/r1492152
Log:
In the interactive conflict menu for local move vs. incoming edit,
remove the 'r' option, which would break the move. This encourages
users to pick the right option to update the move. Breaking the
move is still possible non-interactively with --accept working.

See http://svn.haxx.se/dev/archive-2013-06/0172.shtml and follow-ups.

* subversion/svn/conflict-callbacks.c
  (tree_conflict_options_update_edit_moved_away): Remove the 'r' option from
    the menu, it won't be needed in the usual case.

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=1492152&r1=1492151&r2=1492152&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Wed Jun 12 11:33:09 2013
@@ -559,15 +559,13 @@ static const resolver_option_t tree_conf
   { "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 edit (recommended)"),
-                                  N_("apply incoming edit to move destination"
+  { "mc", N_("apply update to move destination"),
+                                  N_("apply incoming update to move destination"
                                      "  [mine-conflict]"),
                                   svn_wc_conflict_choose_mine_conflict },
-  { "r",  N_("discard edit (breaks move)"), N_("discard edit, mark resolved, "
-                                               "the move 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"),



Mime
View raw message