subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r930281 - /subversion/trunk/subversion/libsvn_wc/wc_db.c
Date Fri, 02 Apr 2010 14:29:52 GMT
Author: rhuijben
Date: Fri Apr  2 14:29:52 2010
New Revision: 930281

URL: http://svn.apache.org/viewvc?rev=930281&view=rev
Log:
* subversion/libsvn_wc/wc_db.c
  (svn_wc__db_temp_op_set_working_incomplete):
     Following up upon r918226 and r930162 fix an assertion on BASE_NODE
     status, to handle the returned statee instead of the in-db statee.

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=930281&r1=930280&r2=930281&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Fri Apr  2 14:29:52 2010
@@ -6482,7 +6482,8 @@ svn_wc__db_temp_op_set_working_incomplet
                                db, local_dir_abspath,
                                scratch_pool, scratch_pool));
 
-  SVN_ERR_ASSERT(status == svn_wc__db_status_normal ||
+  /* Presence in WORKING_NODE must be normal or incomplete */
+  SVN_ERR_ASSERT(status == svn_wc__db_status_added ||
                  status == svn_wc__db_status_incomplete);
 
   SVN_ERR(get_statement_for_path(&stmt, db, local_dir_abspath,



Mime
View raw message