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/01/28 09:09:37 UTC
svn commit: r1727260 - /subversion/trunk/subversion/svn/conflict-callbacks.c
Author: stsp
Date: Thu Jan 28 08:09:37 2016
New Revision: 1727260
URL: http://svn.apache.org/viewvc?rev=1727260&view=rev
Log:
* subversion/svn/conflict-callbacks.c
(binary_conflict_options): Fix indentation.
(tree_conflict_options_update_moved_away,
tree_conflict_options_update_edit_deleted_dir): Split inline --accept
option values off conflict descriptions, as done elsewhere in r1725982.
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=1727260&r1=1727259&r2=1727260&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Thu Jan 28 08:09:37 2016
@@ -461,7 +461,7 @@ static const resolver_option_t binary_co
SVN_CL__ACCEPT_WORKING },
{ "tf", N_("their version"), NULL,
svn_client_conflict_option_incoming_text,
- SVN_CL__ACCEPT_THEIRS_FULL},
+ SVN_CL__ACCEPT_THEIRS_FULL },
{ "p", N_("postpone"), NULL,
svn_client_conflict_option_postpone,
SVN_CL__ACCEPT_POSTPONE},
@@ -517,9 +517,10 @@ static const resolver_option_t tree_conf
static const resolver_option_t tree_conflict_options_update_moved_away[] =
{
{ "mc", N_("apply update to move destination (recommended)"),
- N_("apply incoming update to move destination"
- " [mine-conflict]"),
- svn_client_conflict_option_working_text_where_conflicted },
+ N_("apply incoming update to move "
+ "destination"),
+ svn_client_conflict_option_working_text_where_conflicted,
+ SVN_CL__ACCEPT_MINE_CONFLICT },
{ "p", N_("postpone"), NULL,
svn_client_conflict_option_postpone,
SVN_CL__ACCEPT_POSTPONE },
@@ -534,8 +535,9 @@ static const resolver_option_t tree_conf
{
{ "mc", N_("prepare for updating moved-away children, if any (recommended)"),
N_("allow updating moved-away children "
- "with 'svn resolve' [mine-conflict]"),
- svn_client_conflict_option_working_text_where_conflicted },
+ "with 'svn resolve'"),
+ svn_client_conflict_option_working_text_where_conflicted,
+ SVN_CL__ACCEPT_MINE_CONFLICT },
{ "p", N_("postpone"), NULL,
svn_client_conflict_option_postpone,
SVN_CL__ACCEPT_POSTPONE },