Author: rhuijben
Date: Wed Sep 1 10:40:22 2010
New Revision: 991499
URL: http://svn.apache.org/viewvc?rev=991499&view=rev
Log:
* subversion/libsvn_wc/adm_ops.c
(verify_revert_depth): Following up on r991158, notice that deleted child
nodes won't be impacted by just reverting an ancestor.
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=991499&r1=991498&r2=991499&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Wed Sep 1 10:40:22 2010
@@ -1667,9 +1667,12 @@ verify_revert_depth(svn_wc__db_t *db,
NULL, NULL, NULL, NULL,
db, child_abspath, iterpool, iterpool));
+ /* Not-here and deleted nodes won't be reverted by reverting an operation
+ on a parent, so we can just skip them for the depth check. */
if (status == svn_wc__db_status_not_present
|| status == svn_wc__db_status_absent
- || status == svn_wc__db_status_excluded)
+ || status == svn_wc__db_status_excluded
+ || status == svn_wc__db_status_deleted)
continue;
if (depth == svn_depth_empty
