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 2013/02/18 18:17:53 UTC
svn commit: r1447398 - /subversion/trunk/subversion/svn/conflict-callbacks.c
Author: stsp
Date: Mon Feb 18 17:17:53 2013
New Revision: 1447398
URL: http://svn.apache.org/r1447398
Log:
Fix an enum type mismatch in the 'svn' conflict callbacks menu table.
* subversion/svn/conflict-callbacks.c
(text_conflict_options, prop_conflict_options, obstructed_add_options,
tree_conflict_options, tree_conflict_options_update_moved_away):
Don't assign a svn_cl__accept_t value to svn_wc_conflict_choice_t.
Assign the appropriate conflict_choice_t value instead.
(handle_text_conflict, handle_prop_conflict, handle_tree_conflict,
handle_obstructed_add): If the "q" option was given, record 'postpone'
as a permanent answer to future conflict prompts. This value used
to come directly from menu data, but this meant that the conflict choice
returned to the library was copied from the wrong type of enum.
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=1447398&r1=1447397&r2=1447398&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Mon Feb 18 17:17:53 2013
@@ -337,7 +337,7 @@ static const resolver_option_t text_conf
{ "m", "merge", N_("use internal merge tool to resolve conflict"), -1 },
{ "l", "launch", N_("launch external tool to resolve conflict"), -1 },
{ "q", "quit", N_("postpone all remaining conflicts"),
- svn_cl__accept_postpone },
+ svn_wc_conflict_choose_postpone },
{ "s", "show all options", N_("show this list (also 'h', '?')"), -1 },
{ NULL }
};
@@ -353,7 +353,7 @@ static const resolver_option_t prop_conf
{ "tf", "theirs-full", N_("accept their version of entire file (same)"),
svn_wc_conflict_choose_theirs_full },
{ "q", "quit", N_("postpone all remaining conflicts"),
- svn_cl__accept_postpone },
+ svn_wc_conflict_choose_postpone },
{ "h", "help", N_("show this help (also '?')"), -1 },
{ NULL }
};
@@ -368,7 +368,7 @@ static const resolver_option_t obstructe
{ "tf", "theirs-full", N_("accept incoming item (overwrite pre-existing item)"),
svn_wc_conflict_choose_theirs_full },
{ "q", "quit", N_("postpone all remaining conflicts"),
- svn_cl__accept_postpone },
+ svn_wc_conflict_choose_postpone },
{ "h", "help", N_("show this help (also '?')"), -1 },
{ NULL }
};
@@ -385,7 +385,7 @@ static const resolver_option_t tree_conf
{ "tc", "theirs-conflict", N_("prefer incoming change"),
svn_wc_conflict_choose_theirs_conflict },
{ "q", "quit", N_("postpone all remaining conflicts"),
- svn_cl__accept_postpone },
+ svn_wc_conflict_choose_postpone },
{ "h", "help", N_("show this help (also '?')"), -1 },
{ NULL }
};
@@ -400,7 +400,7 @@ static const resolver_option_t tree_conf
"a copy"),
svn_wc_conflict_choose_theirs_conflict },
{ "q", "quit", N_("postpone all remaining conflicts"),
- svn_cl__accept_postpone },
+ svn_wc_conflict_choose_postpone },
{ "h", "help", N_("show this help (also '?')"), -1 },
{ NULL }
};
@@ -602,7 +602,7 @@ handle_text_conflict(svn_wc_conflict_res
if (strcmp(opt->code, "q") == 0)
{
result->choice = opt->choice;
- b->accept_which = opt->choice;
+ b->accept_which = svn_cl__accept_postpone;
break;
}
else if (strcmp(opt->code, "s") == 0)
@@ -797,7 +797,7 @@ handle_prop_conflict(svn_wc_conflict_res
if (strcmp(opt->code, "q") == 0)
{
result->choice = opt->choice;
- b->accept_which = opt->choice;
+ b->accept_which = svn_cl__accept_postpone;
break;
}
else if (opt->choice != -1)
@@ -858,7 +858,7 @@ handle_tree_conflict(svn_wc_conflict_res
if (strcmp(opt->code, "q") == 0)
{
result->choice = opt->choice;
- b->accept_which = opt->choice;
+ b->accept_which = svn_cl__accept_postpone;
break;
}
else if (opt->choice != -1)
@@ -907,7 +907,7 @@ handle_obstructed_add(svn_wc_conflict_re
if (strcmp(opt->code, "q") == 0)
{
result->choice = opt->choice;
- b->accept_which = opt->choice;
+ b->accept_which = svn_cl__accept_postpone;
break;
}
else if (opt->choice != -1)