svn commit: r1441198 - in /subversion/trunk/subversion: libsvn_wc/wc_db.c tests/cmdline/upgrade_tests.py

[rh...@apache.org]

Author: rhuijben
Date: Thu Jan 31 21:26:32 2013
New Revision: 1441198

URL: http://svn.apache.org/viewvc?rev=1441198&view=rev
Log:
* subversion/libsvn_wc/wc_db.c
  (scan_addition_txn): Resolve crash from upgrade_tests.py, by
    extending the post condition a tiny bit.

* subversion/tests/cmdline/upgrade_tests.py
  (upgrade_missing_replaced): Re-enable entry verifications.

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=1441198&r1=1441197&r2=1441198&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Thu Jan 31 21:26:32 2013
@@ -11208,7 +11208,10 @@ scan_addition_txn(svn_wc__db_status_t *s
           SVN_ERR_ASSERT(!original_repos_id
                          || *original_repos_id == INVALID_REPOS_ID);
         }
-      else
+      /* An upgrade with a missing directory can leave INCOMPLETE working
+         op-roots. See upgrade_tests.py 29: upgrade with missing replaced dir
+       */
+      else if (*status != svn_wc__db_status_incomplete)
         {
           SVN_ERR_ASSERT(!original_repos_relpath
                          || *original_repos_relpath != NULL);

Modified: subversion/trunk/subversion/tests/cmdline/upgrade_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/upgrade_tests.py?rev=1441198&r1=1441197&r2=1441198&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/upgrade_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/upgrade_tests.py Thu Jan 31 21:26:32 2013
@@ -1235,7 +1235,7 @@ def upgrade_missing_replaced(sbox):
   # Pass the old status tree to avoid testing via entries-dump
   # as fetching the entries crashes on the invalid db state.
   svntest.actions.run_and_verify_update(sbox.wc_dir, expected_output,
-                                        None, expected_status.old_tree())
+                                        None, expected_status)
 
   svntest.actions.run_and_verify_svn(None, 'Reverted.*', [], 'revert', '-R',
                                      sbox.wc_dir)