svn commit: r1031616 - in /subversion/trunk/subversion: libsvn_client/copy.c tests/cmdline/copy_tests.py

[ju...@apache.org]

Author: julianfoad
Date: Fri Nov  5 15:11:32 2010
New Revision: 1031616

URL: http://svn.apache.org/viewvc?rev=1031616&view=rev
Log:
In repos-to-WC copies, always get a WC write lock on the *parent* of the
target path, like we do in WC-to-WC copies.  This fixes copy_tests.py 94
which was 'XFail'.

* subversion/libsvn_client/copy.c
  (repos_to_wc_copy): Lock the parent of the target path.

* subversion/tests/cmdline/copy_tests.py
  (test_list): Remove 'XFail' from copy_repos_over_deleted_other_kind.

Modified:
    subversion/trunk/subversion/libsvn_client/copy.c
    subversion/trunk/subversion/tests/cmdline/copy_tests.py

Modified: subversion/trunk/subversion/libsvn_client/copy.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/copy.c?rev=1031616&r1=1031615&r2=1031616&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/copy.c (original)
+++ subversion/trunk/subversion/libsvn_client/copy.c Fri Nov  5 15:11:32 2010
@@ -1795,11 +1795,8 @@ repos_to_wc_copy(const apr_array_header_
   lock_abspath = top_dst_path;
   if (copy_pairs->nelts == 1)
     {
-      svn_node_kind_t kind;
       top_src_url = svn_uri_dirname(top_src_url, pool);
-      SVN_ERR(svn_wc_read_kind(&kind, ctx->wc_ctx, top_dst_path, FALSE, pool));
-      if (kind != svn_node_dir)
-        lock_abspath = svn_dirent_dirname(top_dst_path, pool);
+      lock_abspath = svn_dirent_dirname(top_dst_path, pool);
     }
 
   /* Open a repository session to the longest common src ancestor.  We do not

Modified: subversion/trunk/subversion/tests/cmdline/copy_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/copy_tests.py?rev=1031616&r1=1031615&r2=1031616&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/copy_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/copy_tests.py Fri Nov  5 15:11:32 2010
@@ -5021,7 +5021,7 @@ test_list = [ None,
               XFail(copy_delete_revert),
               delete_replace_delete,
               copy_repos_over_deleted_same_kind,
-              XFail(copy_repos_over_deleted_other_kind),
+              copy_repos_over_deleted_other_kind,
               copy_wc_over_deleted_same_kind,
               copy_wc_over_deleted_other_kind,
              ]