svn commit: r1589711 - /subversion/trunk/subversion/svn/conflict-callbacks.c

[st...@apache.org]

Author: stsp
Date: Thu Apr 24 13:11:11 2014
New Revision: 1589711

URL: http://svn.apache.org/r1589711
Log:
* subversion/svn/conflict-callbacks.c
  (handle_text_conflict): Don't leave 'remains_in_conflict' uninitialised
   in some code paths.

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=1589711&r1=1589710&r2=1589711&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Thu Apr 24 13:11:11 2014
@@ -827,7 +827,7 @@ handle_text_conflict(svn_wc_conflict_res
       else if (strcmp(opt->code, "m") == 0 || strcmp(opt->code, ":-g") == 0 ||
                strcmp(opt->code, "=>-") == 0 || strcmp(opt->code, ":>.") == 0)
         {
-          svn_boolean_t remains_in_conflict;
+          svn_boolean_t remains_in_conflict = TRUE;
           svn_error_t *err;
 
           err = launch_resolver(&performed_edit, desc, b, iterpool);