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

[rh...@apache.org]

Author: rhuijben
Date: Tue Mar  2 22:35:29 2010
New Revision: 918231

URL: http://svn.apache.org/viewvc?rev=918231&view=rev
Log:
* subversion/libsvn_wc/wc_db.c
  (svn_wc__db_temp_op_delete): Following up on r915378, reintroduce a call
    to svn_wc__db_temp_forget_directory, to close 'wc.db' handles of
    directories that are to be deleted. This fixes some test failures
    on Windows.

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=918231&r1=918230&r2=918231&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Tue Mar  2 22:35:29 2010
@@ -3497,7 +3497,14 @@
     }
 
   if (new_working_none && !working_none)
-    SVN_ERR(db_working_actual_remove(db, local_abspath, scratch_pool));
+    {
+      SVN_ERR(db_working_actual_remove(db, local_abspath, scratch_pool));
+      /* ### Search the cached directories in db for directories below
+             local_abspath and close their handles to allow deleting
+             them from the working copy */
+      SVN_ERR(svn_wc__db_temp_forget_directory(db, local_abspath,
+                                               scratch_pool));
+    }
   else if (!new_working_none && working_none)
     SVN_ERR(db_working_insert(new_working_status,
                               db, local_abspath, scratch_pool));