svn commit: r1449507 - /subversion/trunk/subversion/libsvn_client/copy_foreign.c

[rhuijben]

Author: rhuijben
Date: Sun Feb 24 17:29:43 2013
New Revision: 1449507

URL: http://svn.apache.org/r1449507
Log:
* subversion/libsvn_client/copy_foreign.c
  (svn_client__copy_foreign): Avoid db call for determining error message.
    Report excluded nodes as versioned.

Modified:
    subversion/trunk/subversion/libsvn_client/copy_foreign.c

Modified: subversion/trunk/subversion/libsvn_client/copy_foreign.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/copy_foreign.c?rev=1449507&r1=1449506&r2=1449507&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/copy_foreign.c (original)
+++ subversion/trunk/subversion/libsvn_client/copy_foreign.c Sun Feb 24 
17:29:43 2013
@@ -480,17 +480,12 @@ svn_client__copy_foreign(const char *url
                 _("'%s' is not a valid location inside a repository"),
                 url);
 
-  SVN_ERR(svn_wc_read_kind(&wc_kind, ctx->wc_ctx, dst_abspath, FALSE,
-                           scratch_pool));
+  SVN_ERR(svn_wc_read_kind2(&wc_kind, ctx->wc_ctx, dst_abspath, FALSE, TRUE,
+                            scratch_pool));
 
   if (wc_kind != svn_node_none)
     {
-      svn_boolean_t deleted;
-      SVN_ERR(svn_wc__node_is_status_deleted(&deleted, ctx->wc_ctx,
-                                             dst_abspath, scratch_pool));
-
-      if (! deleted)
-        return svn_error_createf(
+      return svn_error_createf(
                 SVN_ERR_ENTRY_EXISTS, NULL,
                 _("'%s' is already under version control"),
                 svn_dirent_local_style(dst_abspath, scratch_pool));