Return-Path: Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: (qmail 90381 invoked from network); 4 Jun 2010 08:48:21 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 4 Jun 2010 08:48:21 -0000 Received: (qmail 99872 invoked by uid 500); 4 Jun 2010 08:48:21 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 99765 invoked by uid 500); 4 Jun 2010 08:48:20 -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 99758 invoked by uid 99); 4 Jun 2010 08:48:19 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Jun 2010 08:48:19 +0000 X-ASF-Spam-Status: No, hits=-1862.9 required=10.0 tests=ALL_TRUSTED,AWL 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; Fri, 04 Jun 2010 08:48:18 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id AC143238898B; Fri, 4 Jun 2010 08:47:58 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r951324 - /subversion/trunk/subversion/libsvn_wc/wc_db.c Date: Fri, 04 Jun 2010 08:47:58 -0000 To: commits@subversion.apache.org From: philip@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100604084758.AC143238898B@eris.apache.org> Author: philip Date: Fri Jun 4 08:47:58 2010 New Revision: 951324 URL: http://svn.apache.org/viewvc?rev=951324&view=rev Log: * subversion/libsvn_wc/wc_db.c (temp_cross_db_copy): Use blank_iwb. (svn_wc__db_op_copy): Clarify a comment. 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=951324&r1=951323&r2=951324&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_wc/wc_db.c (original) +++ subversion/trunk/subversion/libsvn_wc/wc_db.c Fri Jun 4 08:47:58 2010 @@ -2246,6 +2246,7 @@ temp_cross_db_copy(svn_wc__db_t *db, SVN_ERR(svn_wc__get_pristine_props(&props, db, src_abspath, scratch_pool, scratch_pool)); + blank_iwb(&iwb); iwb.presence = svn_wc__db_status_normal; iwb.kind = kind; iwb.wc_id = dst_pdh->wcroot->wc_id; @@ -2264,8 +2265,6 @@ temp_cross_db_copy(svn_wc__db_t *db, iwb.children = children; iwb.depth = depth; - iwb.work_items = NULL; - SVN_ERR(insert_working_node(&iwb, dst_pdh->wcroot->sdb, scratch_pool)); SVN_ERR(svn_sqlite__get_statement(&stmt, src_pdh->wcroot->sdb, @@ -2410,8 +2409,8 @@ svn_wc__db_op_copy(svn_wc__db_t *db, } } - /* When copying a directory we only copy the parent stub if the - destination directory does not exist. */ + /* When copying a directory the destination may not exist, if so we + only copy the parent stub */ if (kind == svn_wc__db_kind_dir && !*src_relpath && *dst_relpath) { SVN_ERR(navigate_to_parent(&src_pdh, db, src_pdh,