Author: rhuijben
Date: Mon Jun 4 18:03:34 2012
New Revision: 1346063
URL: http://svn.apache.org/viewvc?rev=1346063&view=rev
Log:
* subversion/libsvn_wc/wc_db.c
(db_base_remove): There is no need to retract a parent delete if the node
is not shadowed.
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=1346063&r1=1346062&r2=1346063&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Mon Jun 4 18:03:34 2012
@@ -1957,8 +1957,6 @@ db_base_remove(void *baton,
SVN_ERR(svn_sqlite__bindf(stmt, "is", wcroot->wc_id, local_relpath));
SVN_ERR(svn_sqlite__step_done(stmt));
- SVN_ERR(retract_parent_delete(wcroot, local_relpath, scratch_pool));
-
/* If there is no working node then any actual node must be deleted,
unless it marks a conflict */
SVN_ERR(svn_sqlite__get_statement(&stmt, wcroot->sdb,
@@ -1973,6 +1971,8 @@ db_base_remove(void *baton,
SVN_ERR(svn_sqlite__bindf(stmt, "is", wcroot->wc_id, local_relpath));
SVN_ERR(svn_sqlite__step_done(stmt));
}
+ else
+ SVN_ERR(retract_parent_delete(wcroot, local_relpath, scratch_pool));
return SVN_NO_ERROR;
}
