svn commit: r1098531 - /subversion/trunk/subversion/libsvn_wc/conflicts.c

[hwright]

Author: hwright
Date: Mon May  2 11:55:38 2011
New Revision: 1098531

URL: http://svn.apache.org/viewvc?rev=1098531&view=rev
Log:
* subversion/libsvn_wc/conflicts.c
  (resolve_one_conflict): Initialize a variable which only gets set
    conditionally within this function.

Modified:
    subversion/trunk/subversion/libsvn_wc/conflicts.c

Modified: subversion/trunk/subversion/libsvn_wc/conflicts.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/conflicts.c?rev=1098531&r1=1098530&r2=1098531&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.c Mon May  2 11:55:38 2011
@@ -354,7 +354,7 @@ resolve_one_conflict(svn_wc__db_t *db,
   const apr_array_header_t *conflicts;
   apr_pool_t *iterpool = svn_pool_create(scratch_pool);
   int i;
-  svn_boolean_t resolved;
+  svn_boolean_t resolved = FALSE;
 
   SVN_ERR(svn_wc__db_read_conflicts(&conflicts, db, local_abspath,
                                     scratch_pool, iterpool));