On the multiple moves branch: When doing a repo->wc copy with only one item, use the directory name of that item as the top_src_url, not the name of the item itself. * subversion/libsvn_client/copy.c (repos_to_wc_copy): Use the directory name when there is only one source. git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/multiple-moves@862833 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/subversion/libsvn_client/copy.c b/subversion/libsvn_client/copy.c index e9be1c2..6852f32 100644 --- a/subversion/libsvn_client/copy.c +++ b/subversion/libsvn_client/copy.c
@@ -1042,6 +1042,8 @@ int i; get_copy_pair_ancestors(copy_pairs, &top_src_url, &top_dst_path, NULL, pool); + if (copy_pairs->nelts == 1) + top_src_url = svn_path_dirname(top_src_url, pool); /* Open a repository session to the longest common src ancestor. We do not (yet) have a working copy, so we don't have a corresponding path and