subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1340674 - /subversion/trunk/subversion/libsvn_wc/wc_db.c
Date Sun, 20 May 2012 11:15:11 GMT
Author: rhuijben
Date: Sun May 20 11:15:10 2012
New Revision: 1340674

URL: http://svn.apache.org/viewvc?rev=1340674&view=rev
Log:
* subversion/libsvn_wc/wc_db.c
  (delete_node): If status is normal, then op-depth is 0.

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=1340674&r1=1340673&r2=1340674&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Sun May 20 11:15:10 2012
@@ -6668,7 +6668,10 @@ delete_node(void *baton,
   else
     {
       add_work = TRUE;
-      SVN_ERR(op_depth_of(&select_depth, wcroot, local_relpath));
+      if (status != svn_wc__db_status_normal)
+        SVN_ERR(op_depth_of(&select_depth, wcroot, local_relpath));
+      else
+        select_depth = 0; /* Deleting BASE node */
     }
 
   /* ### Put actual-only nodes into the list? */



Mime
View raw message