Return-Path: X-Original-To: apmail-subversion-commits-archive@minotaur.apache.org Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 51531901B for ; Sun, 20 May 2012 11:15:32 +0000 (UTC) Received: (qmail 75932 invoked by uid 500); 20 May 2012 11:15:32 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 75910 invoked by uid 500); 20 May 2012 11:15:32 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 75900 invoked by uid 99); 20 May 2012 11:15:32 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 20 May 2012 11:15:32 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 20 May 2012 11:15:31 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3CB7623889E3; Sun, 20 May 2012 11:15:11 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1340674 - /subversion/trunk/subversion/libsvn_wc/wc_db.c Date: Sun, 20 May 2012 11:15:11 -0000 To: commits@subversion.apache.org From: rhuijben@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120520111511.3CB7623889E3@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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? */