You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by ph...@apache.org on 2013/03/21 14:30:49 UTC

svn commit: r1459303 - /subversion/trunk/subversion/libsvn_client/merge.c

Author: philip
Date: Thu Mar 21 13:30:48 2013
New Revision: 1459303

URL: http://svn.apache.org/r1459303
Log:
* subversion/libsvn_client/merge.c
  (merge_reintegrate_locked): Initialise variable to avoid unnecessary
   sleeps.

Modified:
    subversion/trunk/subversion/libsvn_client/merge.c

Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1459303&r1=1459302&r2=1459303&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Thu Mar 21 13:30:48 2013
@@ -11607,7 +11607,7 @@ merge_reintegrate_locked(conflict_report
   svn_client__pathrev_t *source_loc;
   merge_source_t *source;
   svn_client__pathrev_t *yc_ancestor;
-  svn_boolean_t use_sleep;
+  svn_boolean_t use_sleep = FALSE;
   svn_error_t *err;
 
   SVN_ERR(open_reintegrate_source_and_target(