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 2012/10/17 12:59:48 UTC
svn commit: r1399175 - /subversion/trunk/subversion/svn/conflict-callbacks.c
Author: stsp
Date: Wed Oct 17 10:59:48 2012
New Revision: 1399175
URL: http://svn.apache.org/viewvc?rev=1399175&view=rev
Log:
Follow-up to r1398304:
* subversion/svn/conflict-callbacks.c
(handle_text_conflict): Fix reversed strcmp() return value interpretation.
Restores the ability to mark a conflict resolved from the interactive
conflict resolution prompt. Ooops!
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=1399175&r1=1399174&r2=1399175&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Wed Oct 17 10:59:48 2012
@@ -477,7 +477,7 @@ handle_text_conflict(svn_wc_conflict_res
if (performed_edit)
knows_something = TRUE;
}
- else if (strcmp(answer, "m") == 0 || strcmp(answer, ":-g") ||
+ else if (strcmp(answer, "m") == 0 || strcmp(answer, ":-g") == 0 ||
strcmp(answer, "=>-") == 0 || strcmp(answer, ":>.") == 0)
{
if (desc->kind != svn_wc_conflict_kind_text)