You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2016/04/20 17:52:08 UTC
svn commit: r1740159 - /subversion/trunk/subversion/svn/conflict-callbacks.c
Author: stsp
Date: Wed Apr 20 15:52:08 2016
New Revision: 1740159
URL: http://svn.apache.org/viewvc?rev=1740159&view=rev
Log:
The "mine-conflict" and "their-conflict" options are rarely more appropriate
than "edit" and "merge". Don't encourage gratuitous use of them by not showing
them at the initial conflict prompt. They're still visible in the help menu.
* subversion/svn/conflict-callbacks.c
(builtin_resolver_options): Drop the short descriptions for "mc", "tc",
"mf", and "tf" options. The help menu shows better long descriptions.
(handle_text_conflict): Don't add "mc" and "tc" to the initial list of
suggested options.
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=1740159&r1=1740158&r2=1740159&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Wed Apr 20 15:52:08 2016
@@ -391,16 +391,16 @@ static const resolver_option_t builtin_r
{ "r", N_("mark resolved"), NULL,
svn_client_conflict_option_merged_text,
SVN_CL__ACCEPT_WORKING },
- { "mc", N_("my side of conflict"), NULL,
+ { "mc", NULL, NULL,
svn_client_conflict_option_working_text_where_conflicted,
SVN_CL__ACCEPT_MINE_CONFLICT },
- { "tc", N_("their side of conflict"), NULL,
+ { "tc", NULL, NULL,
svn_client_conflict_option_incoming_text_where_conflicted,
SVN_CL__ACCEPT_THEIRS_CONFLICT },
- { "mf", N_("my version"), NULL,
+ { "mf", NULL, NULL,
svn_client_conflict_option_working_text,
SVN_CL__ACCEPT_MINE_FULL},
- { "tf", N_("their version"), NULL,
+ { "tf", NULL, NULL,
svn_client_conflict_option_incoming_text,
SVN_CL__ACCEPT_THEIRS_FULL },
{ "p", N_("postpone"), NULL,
@@ -871,9 +871,6 @@ handle_text_conflict(svn_boolean_t *reso
if (knows_something)
*next_option++ = "r";
-
- *next_option++ = "mc";
- *next_option++ = "tc";
}
else
{