Author: danielsh
Date: Thu Mar 31 09:55:09 2011
New Revision: 1087230
URL: http://svn.apache.org/viewvc?rev=1087230&view=rev
Log:
Revert r1087131.
Modified:
subversion/trunk/subversion/libsvn_wc/cleanup.c
Modified: subversion/trunk/subversion/libsvn_wc/cleanup.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/cleanup.c?rev=1087230&r1=1087229&r2=1087230&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/cleanup.c (original)
+++ subversion/trunk/subversion/libsvn_wc/cleanup.c Thu Mar 31 09:55:09 2011
@@ -87,6 +87,8 @@ cleanup_internal(svn_wc__db_t *db,
/* Can we even work with this directory? */
SVN_ERR(can_be_cleaned(&wc_format, db, adm_abspath, iterpool));
+ /* ### This fails if ADM_ABSPATH is locked indirectly via a
+ ### recursive lock on an ancestor. */
SVN_ERR(svn_wc__db_wclock_obtain(db, adm_abspath, -1, TRUE, iterpool));
/* Run our changes before the subdirectories. We may not have to recurse
@@ -143,10 +145,6 @@ svn_wc_cleanup3(svn_wc_context_t *wc_ctx
NULL /* ### config */, TRUE, FALSE,
scratch_pool, scratch_pool));
- /* Always cleanup from the wc root, even when invoked on child. */
- SVN_ERR(svn_wc__db_get_wcroot(&local_abspath, db, local_abspath,
- scratch_pool, scratch_pool));
-
SVN_ERR(cleanup_internal(db, local_abspath, cancel_func, cancel_baton,
scratch_pool));
