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 2010/11/10 22:00:25 UTC
svn commit: r1033707 - /subversion/trunk/subversion/svn/conflict-callbacks.c
Author: stsp
Date: Wed Nov 10 21:00:25 2010
New Revision: 1033707
URL: http://svn.apache.org/viewvc?rev=1033707&view=rev
Log:
* subversion/svn/conflict-callbacks.c
(svn_cl__accept_from_word, svn_cl__conflict_handler): Psst.... nothing to
see here, move along.
Review by: danielsh
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=1033707&r1=1033706&r2=1033707&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Wed Nov 10 21:00:25 2010
@@ -61,7 +61,7 @@ svn_cl__accept_from_word(const char *wor
{
/* Shorthand options are consistent with svn_cl__conflict_handler(). */
if (strcmp(word, SVN_CL__ACCEPT_POSTPONE) == 0
- || strcmp(word, "p") == 0)
+ || strcmp(word, "p") == 0 || strcmp(word, ":-P") == 0)
return svn_cl__accept_postpone;
if (strcmp(word, SVN_CL__ACCEPT_BASE) == 0)
/* ### shorthand? */
@@ -70,22 +70,22 @@ svn_cl__accept_from_word(const char *wor
/* ### shorthand? */
return svn_cl__accept_working;
if (strcmp(word, SVN_CL__ACCEPT_MINE_CONFLICT) == 0
- || strcmp(word, "mc") == 0)
+ || strcmp(word, "mc") == 0 || strcmp(word, "X-)") == 0)
return svn_cl__accept_mine_conflict;
if (strcmp(word, SVN_CL__ACCEPT_THEIRS_CONFLICT) == 0
- || strcmp(word, "tc") == 0)
+ || strcmp(word, "tc") == 0 || strcmp(word, "X-(") == 0)
return svn_cl__accept_theirs_conflict;
if (strcmp(word, SVN_CL__ACCEPT_MINE_FULL) == 0
- || strcmp(word, "mf") == 0)
+ || strcmp(word, "mf") == 0 || strcmp(word, ":-)") == 0)
return svn_cl__accept_mine_full;
if (strcmp(word, SVN_CL__ACCEPT_THEIRS_FULL) == 0
- || strcmp(word, "tf") == 0)
+ || strcmp(word, "tf") == 0 || strcmp(word, ":-(") == 0)
return svn_cl__accept_theirs_full;
if (strcmp(word, SVN_CL__ACCEPT_EDIT) == 0
- || strcmp(word, "e") == 0)
+ || strcmp(word, "e") == 0 || strcmp(word, ":-E") == 0)
return svn_cl__accept_edit;
if (strcmp(word, SVN_CL__ACCEPT_LAUNCH) == 0
- || strcmp(word, "l") == 0)
+ || strcmp(word, "l") == 0 || strcmp(word, ":-l") == 0)
return svn_cl__accept_launch;
/* word is an invalid action. */
return svn_cl__accept_invalid;
@@ -529,13 +529,13 @@ svn_cl__conflict_handler(svn_wc_conflict
"resolve conflict\n"
" (s) show all - show this list\n\n")));
}
- else if (strcmp(answer, "p") == 0)
+ else if (strcmp(answer, "p") == 0 || strcmp(answer, ":-P") == 0)
{
/* Do nothing, let file be marked conflicted. */
(*result)->choice = svn_wc_conflict_choose_postpone;
break;
}
- else if (strcmp(answer, "mc") == 0)
+ else if (strcmp(answer, "mc") == 0 || strcmp(answer, "X-)") == 0)
{
if (desc->is_binary)
{
@@ -559,7 +559,7 @@ svn_cl__conflict_handler(svn_wc_conflict
(*result)->save_merged = TRUE;
break;
}
- else if (strcmp(answer, "tc") == 0)
+ else if (strcmp(answer, "tc") == 0 || strcmp(answer, "X-(") == 0)
{
if (desc->is_binary)
{
@@ -582,14 +582,14 @@ svn_cl__conflict_handler(svn_wc_conflict
(*result)->save_merged = TRUE;
break;
}
- else if (strcmp(answer, "mf") == 0)
+ else if (strcmp(answer, "mf") == 0 || strcmp(answer, ":-)") == 0)
{
(*result)->choice = svn_wc_conflict_choose_mine_full;
if (performed_edit)
(*result)->save_merged = TRUE;
break;
}
- else if (strcmp(answer, "tf") == 0)
+ else if (strcmp(answer, "tf") == 0 || strcmp(answer, ":-(") == 0)
{
(*result)->choice = svn_wc_conflict_choose_theirs_full;
if (performed_edit)
@@ -637,13 +637,13 @@ svn_cl__conflict_handler(svn_wc_conflict
SVN_ERR(show_diff(desc, subpool));
knows_something = TRUE;
}
- else if (strcmp(answer, "e") == 0)
+ else if (strcmp(answer, "e") == 0 || strcmp(answer, ":-E") == 0)
{
SVN_ERR(open_editor(&performed_edit, desc, b, subpool));
if (performed_edit)
knows_something = TRUE;
}
- else if (strcmp(answer, "l") == 0)
+ else if (strcmp(answer, "l") == 0 || strcmp(answer, ":-l") == 0)
{
if (desc->kind == svn_wc_conflict_kind_property)
{
@@ -729,17 +729,17 @@ svn_cl__conflict_handler(svn_wc_conflict
"(overwrite pre-existing item)\n"
" (h) help - show this help\n\n")));
}
- if (strcmp(answer, "p") == 0)
+ if (strcmp(answer, "p") == 0 || strcmp(answer, ":-P") == 0)
{
(*result)->choice = svn_wc_conflict_choose_postpone;
break;
}
- if (strcmp(answer, "mf") == 0)
+ if (strcmp(answer, "mf") == 0 || strcmp(answer, ":-)") == 0)
{
(*result)->choice = svn_wc_conflict_choose_mine_full;
break;
}
- if (strcmp(answer, "tf") == 0)
+ if (strcmp(answer, "tf") == 0 || strcmp(answer, ":-(") == 0)
{
(*result)->choice = svn_wc_conflict_choose_theirs_full;
break;