Return-Path: Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: (qmail 7658 invoked from network); 23 Apr 2010 17:16:10 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 23 Apr 2010 17:16:10 -0000 Received: (qmail 60279 invoked by uid 500); 23 Apr 2010 16:49:30 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 60260 invoked by uid 500); 23 Apr 2010 16:49:30 -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 60253 invoked by uid 99); 23 Apr 2010 16:49:30 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 Apr 2010 16:49:30 +0000 X-ASF-Spam-Status: No, hits=-1731.1 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, 23 Apr 2010 16:49:29 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id EB8A223888FE; Fri, 23 Apr 2010 16:48:47 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r937364 - /subversion/trunk/subversion/libsvn_client/copy.c Date: Fri, 23 Apr 2010 16:48:47 -0000 To: commits@subversion.apache.org From: philip@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100423164847.EB8A223888FE@eris.apache.org> Author: philip Date: Fri Apr 23 16:48:47 2010 New Revision: 937364 URL: http://svn.apache.org/viewvc?rev=937364&view=rev Log: * subversion/libsvn_client/copy.c (try_copy): Remove an svn_wc_entry_t. Modified: subversion/trunk/subversion/libsvn_client/copy.c Modified: subversion/trunk/subversion/libsvn_client/copy.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/copy.c?rev=937364&r1=937363&r2=937364&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_client/copy.c (original) +++ subversion/trunk/subversion/libsvn_client/copy.c Fri Apr 23 16:48:47 2010 @@ -1958,18 +1958,14 @@ try_copy(svn_commit_info_t **commit_info svn_client__copy_pair_t *pair = APR_ARRAY_IDX(copy_pairs, i, svn_client__copy_pair_t *); const char *src_abspath; - - const svn_wc_entry_t *entry; + svn_boolean_t is_file_external; svn_pool_clear(iterpool); SVN_ERR(svn_dirent_get_absolute(&src_abspath, pair->src, iterpool)); - SVN_ERR(svn_wc__get_entry_versioned(&entry, ctx->wc_ctx, - src_abspath, svn_node_unknown, - FALSE, FALSE, - iterpool, iterpool)); - - if (entry->file_external_path) + SVN_ERR(svn_wc__node_is_file_external(&is_file_external, ctx->wc_ctx, + src_abspath, iterpool)); + if (is_file_external) return svn_error_createf(SVN_ERR_WC_CANNOT_MOVE_FILE_EXTERNAL, NULL, _("Cannot move the file external at "