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 2013/06/18 17:22:42 UTC

svn commit: r1494171 - /subversion/trunk/subversion/libsvn_wc/wc_db.c

Author: stsp
Date: Tue Jun 18 15:22:42 2013
New Revision: 1494171

URL: http://svn.apache.org/r1494171
Log:
* subversion/libsvn_wc/wc_db.c
  (svn_wc__db_bump_format): Keep *bumped_format as FALSE in case of error,
    rather than setting it based on the potentially undefined value of
    *result_format. Most likely not a functional change, since callers
    shouldn't be using output when this function returns an error.

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

Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1494171&r1=1494170&r2=1494171&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Tue Jun 18 15:22:42 2013
@@ -15038,7 +15038,7 @@ svn_wc__db_bump_format(int *result_forma
   err = svn_wc__upgrade_sdb(result_format, wcroot_abspath,
                             sdb, format, scratch_pool);
 
-  if (bumped_format)
+  if (err == SVN_NO_ERROR && bumped_format)
     *bumped_format = (*result_format > format);
 
   /* Make sure we return a different error than expected for upgrades from