Author: hwright
Date: Sat Apr 14 14:01:15 2012
New Revision: 1326104
URL: http://svn.apache.org/viewvc?rev=1326104&view=rev
Log:
On the ev2-export branch:
Fix the last failing test, by checking the correct paths for validity.
(As an aside, without these checks, commit test 36 seems to Do The Right Thing,
which makes me wonder if we should just remove the checks all together and
just allow this functionality.)
* subversion/libsvn_client/copy.c
(drive_single_path): Remove path validity check.
(repos_to_repos_copy): Check path validity here.
Modified:
subversion/branches/ev2-export/subversion/libsvn_client/copy.c
Modified: subversion/branches/ev2-export/subversion/libsvn_client/copy.c
URL:
http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/libsvn_client/copy.c?rev=1326104&r1=1326103&r2=1326104&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/libsvn_client/copy.c (original)
+++ subversion/branches/ev2-export/subversion/libsvn_client/copy.c Sat Apr 14
14:01:15 2012
@@ -672,8 +672,6 @@ drive_single_path(svn_editor_t *editor,
}
if (do_add)
{
- SVN_ERR(svn_path_check_valid(path, scratch_pool));
-
/* ### Need to get existing props, rather than just set mergeinfo
on an empty set of props. */
if (path_info->mergeinfo)
@@ -1097,11 +1095,15 @@ repos_to_repos_copy(const apr_array_head
path_driver_info_t *info = APR_ARRAY_IDX(path_infos, i,
path_driver_info_t *);
+ SVN_ERR(svn_path_check_valid(info->dst_path, pool));
APR_ARRAY_PUSH(paths, const char *) = svn_path_url_add_component2(
top_url, info->dst_path, pool);
if (is_move && (! info->resurrection))
- APR_ARRAY_PUSH(paths, const char *) = svn_path_url_add_component2(
- top_url, info->src_path, pool);
+ {
+ SVN_ERR(svn_path_check_valid(info->src_path, pool));
+ APR_ARRAY_PUSH(paths, const char *) = svn_path_url_add_component2(
+ top_url, info->src_path, pool);
+ }
}
SVN_ERR(svn_client__ensure_revprop_table(&commit_revprops, revprop_table,
