You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by gs...@apache.org on 2010/04/28 02:45:47 UTC
svn commit: r938741 - /subversion/trunk/subversion/libsvn_wc/adm_ops.c
Author: gstein
Date: Wed Apr 28 00:45:47 2010
New Revision: 938741
URL: http://svn.apache.org/viewvc?rev=938741&view=rev
Log:
Remove the calls to clear the dav_cache. The node is about to be blasted
away, so this is no longer necessary.
* subversion/libsvn_wc/adm_ops.c:
(svn_wc__internal_remove_from_revision_control): remove clearing of the
dav_cache since we're about to delete the node
Modified:
subversion/trunk/subversion/libsvn_wc/adm_ops.c
Modified: subversion/trunk/subversion/libsvn_wc/adm_ops.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_ops.c?rev=938741&r1=938740&r2=938741&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Wed Apr 28 00:45:47 2010
@@ -2412,12 +2412,6 @@ svn_wc__internal_remove_from_revision_co
SVN_ERR(svn_wc__text_base_path(&text_base_file, db, local_abspath,
FALSE, scratch_pool));
- /* Clear the dav cache. */
- /* ### one day... (now?) this will simply be part of removing the
- ### BASE_NODE row. */
- SVN_ERR(svn_wc__db_base_set_dav_cache(db, local_abspath, NULL,
- scratch_pool));
-
/* Remove prop/NAME, prop-base/NAME.svn-base. */
SVN_ERR(svn_wc__props_delete(db, local_abspath, svn_wc__props_working,
scratch_pool));
@@ -2428,8 +2422,7 @@ svn_wc__internal_remove_from_revision_co
SVN_ERR(svn_wc__entry_remove(db, local_abspath, scratch_pool));
/* Remove text-base/NAME.svn-base */
- SVN_ERR(svn_io_remove_file2(text_base_file,
- TRUE, scratch_pool));
+ SVN_ERR(svn_io_remove_file2(text_base_file, TRUE, scratch_pool));
/* If we were asked to destroy the working file, do so unless
it has local mods. */
@@ -2459,10 +2452,6 @@ svn_wc__internal_remove_from_revision_co
/* ### sanity check: check 2 places for DELETED flag? */
- /* Get rid of the dav cache for this directory. */
- SVN_ERR(svn_wc__db_base_set_dav_cache(db, local_abspath, NULL,
- iterpool));
-
/* Walk over every entry. */
SVN_ERR(svn_wc__db_read_children(&children, db, local_abspath,
scratch_pool, iterpool));