You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2010/06/04 17:33:44 UTC
svn commit: r951445 - /subversion/trunk/subversion/libsvn_wc/copy.c
Author: philip
Date: Fri Jun 4 15:33:44 2010
New Revision: 951445
URL: http://svn.apache.org/viewvc?rev=951445&view=rev
Log:
Make SVN_EXPERIMENTAL_COPY pass more regression tests; most of
copy_tests.py now pass including an XPASS for 82.
* subversion/libsvn_wc/copy.c
(copy_versioned_dir): Get repos URL/UUID for added sources.
Modified:
subversion/trunk/subversion/libsvn_wc/copy.c
Modified: subversion/trunk/subversion/libsvn_wc/copy.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/copy.c?rev=951445&r1=951444&r2=951445&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/copy.c (original)
+++ subversion/trunk/subversion/libsvn_wc/copy.c Fri Jun 4 15:33:44 2010
@@ -969,8 +969,18 @@ copy_versioned_dir(svn_wc_context_t *wc_
wc_ctx->db, src_abspath,
scratch_pool, scratch_pool));
- /* ### Need to handle more states, in particular copies. */
- SVN_ERR_ASSERT(status == svn_wc__db_status_normal);
+ if (status == svn_wc__db_status_added)
+ SVN_ERR(svn_wc__db_scan_addition(NULL /* status */,
+ NULL /* op_root_abspath */,
+ NULL /* repos_relpath */,
+ &repos_root_url,
+ &repos_uuid,
+ NULL /* original_repos_relpath */,
+ NULL /* original_root_url */,
+ NULL /* original_uuid */,
+ NULL /* original_revision */,
+ wc_ctx->db, src_abspath,
+ scratch_pool, scratch_pool));
SVN_ERR(svn_wc__internal_ensure_adm(wc_ctx->db, tmp_dst_abspath,
url, repos_root_url, repos_uuid,