You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2010/12/06 19:24:33 UTC
svn commit: r1042755 - /subversion/trunk/subversion/libsvn_wc/wc_db.c
Author: philip
Date: Mon Dec 6 18:24:33 2010
New Revision: 1042755
URL: http://svn.apache.org/viewvc?rev=1042755&view=rev
Log:
Tweak scan_deletion to fix 3 SVN_WC__OP_DEPTH regression tests.
* subversion/libsvn_wc/wc_db.c
(scan_deletion): Don't set work_del_relpath when the op-depth goes up,
do set it if the child was not-present.
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=1042755&r1=1042754&r2=1042755&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Mon Dec 6 18:24:33 2010
@@ -7201,7 +7201,8 @@ scan_deletion(const char **base_del_relp
local_op_depth = op_depth;
if (work_del_relpath && !work_del_relpath[0]
- && op_depth != local_op_depth && op_depth > 0)
+ && ((op_depth < local_op_depth && op_depth > 0)
+ || child_presence == svn_wc__db_status_not_present))
#else
if (work_del_relpath != NULL
&& work_presence == svn_wc__db_status_normal