Author: philip Date: Wed Oct 19 11:30:26 2011 New Revision: 1186109 URL: http://svn.apache.org/viewvc?rev=1186109&view=rev Log: Fix issue 4035, checksum!=NULL assert after upgrade. The major part of the fix is r1177732, this commit adjusts the verification code.
* subversion/libsvn_wc/wc_db.c (scan_addition_txn, scan_deletion_txn): Allow working/incomplete in asserts. * subversion/tests/cmdline/upgrade_tests.py (upgrade_missing_replaced): Remove WIMP. Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c subversion/trunk/subversion/tests/cmdline/upgrade_tests.py Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1186109&r1=1186108&r2=1186109&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_wc/wc_db.c (original) +++ subversion/trunk/subversion/libsvn_wc/wc_db.c Wed Oct 19 11:30:26 2011 @@ -9665,6 +9665,7 @@ scan_addition_txn(void *baton, { SVN_ERR_ASSERT(*sab->status == svn_wc__db_status_added || *sab->status == svn_wc__db_status_copied + || *sab->status == svn_wc__db_status_incomplete || *sab->status == svn_wc__db_status_moved_here); if (*sab->status == svn_wc__db_status_added) { @@ -9918,8 +9919,8 @@ scan_deletion_txn(void *baton, local_relpath, scratch_pool)); - /* ### incomplete not handled */ SVN_ERR_ASSERT(work_presence == svn_wc__db_status_normal + || work_presence == svn_wc__db_status_incomplete || work_presence == svn_wc__db_status_not_present || work_presence == svn_wc__db_status_base_deleted); Modified: subversion/trunk/subversion/tests/cmdline/upgrade_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/upgrade_tests.py?rev=1186109&r1=1186108&r2=1186109&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/upgrade_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/upgrade_tests.py Wed Oct 19 11:30:26 2011 @@ -1234,7 +1234,6 @@ def upgrade_absent(sbox): None, None) @Issue(4035) -@Wimp(4035) def upgrade_missing_replaced(sbox): "upgrade with missing replaced dir"