You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2012/03/23 16:31:12 UTC
svn commit: r1304439 - in /subversion/trunk/subversion: libsvn_client/copy.c
tests/cmdline/copy_tests.py
Author: rhuijben
Date: Fri Mar 23 15:31:12 2012
New Revision: 1304439
URL: http://svn.apache.org/viewvc?rev=1304439&view=rev
Log:
* subversion/libsvn_client/copy.c
(verify_wc_srcs_and_dsts): Verify if the target directory of a copy exists
as part of the working copy when using --parents. Not just if it exists
as a directory.
* subversion/tests/cmdline/copy_tests.py
(copy_to_unversioned_parent): Remove XFail marker.
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=1304439&r1=1304438&r2=1304439&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/copy.c (original)
+++ subversion/trunk/subversion/libsvn_client/copy.c Fri Mar 23 15:31:12 2012
@@ -495,6 +495,16 @@ verify_wc_srcs_and_dsts(const apr_array_
SVN_ERR(svn_client__make_local_parents(pair->dst_parent_abspath,
TRUE, ctx, iterpool));
}
+ else if(make_parents && dst_parent_kind == svn_node_dir)
+ {
+ /* Check if parent is already versioned */
+ SVN_ERR(svn_wc_read_kind(&dst_parent_kind, ctx->wc_ctx,
+ pair->dst_parent_abspath, FALSE, iterpool));
+
+ if (dst_parent_kind == svn_node_none)
+ SVN_ERR(svn_client__make_local_parents(pair->dst_parent_abspath,
+ TRUE, ctx, iterpool));
+ }
else if (dst_parent_kind != svn_node_dir)
{
return svn_error_createf(SVN_ERR_WC_NOT_WORKING_COPY, NULL,
Modified: subversion/trunk/subversion/tests/cmdline/copy_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/copy_tests.py?rev=1304439&r1=1304438&r2=1304439&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/copy_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/copy_tests.py Fri Mar 23 15:31:12 2012
@@ -5675,7 +5675,6 @@ def three_nested_moves(sbox):
expected_status,
None, wc_dir)
-@XFail() # Will add fix soon
def copy_to_unversioned_parent(sbox):
"copy to unversioned parent"