Author: rhuijben
Date: Mon Feb 16 13:36:26 2015
New Revision: 1660114
URL: http://svn.apache.org/r1660114
Log:
Resolve issue #4559, by not calculating a value that isn't used anyway.
Note that the case that src_path is NULL is triggered by the tests
added in r1660110, but the code that caused the error in issue #4559
is not.
* subversion/libsvn_client/copy.c
(queue_externals_change_path_infos): Don't set src_path.
(repos_to_repos_copy): Make it explicit that src_path can be NULL.
Modified:
subversion/trunk/subversion/libsvn_client/copy.c
Modified: subversion/trunk/subversion/libsvn_client/copy.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/copy.c?rev=1660114&r1=1660113&r2=1660114&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/copy.c (original)
+++ subversion/trunk/subversion/libsvn_client/copy.c Mon Feb 16 13:36:26 2015
@@ -1374,9 +1374,7 @@ queue_externals_change_path_infos(apr_ar
info->src_url = svn_path_url_add_component2(
parent_info->src_url, dst_relpath,
result_pool);
- info->src_path = svn_relpath_join(parent_info->src_path,
- dst_relpath,
- result_pool);
+ info->src_path = NULL; /* Only needed on copied dirs */
info->dst_path = svn_relpath_join(parent_info->dst_path,
dst_relpath,
result_pool);
@@ -1677,7 +1675,7 @@ repos_to_repos_copy(const apr_array_head
}
/* More info for our INFO structure. */
- info->src_path = src_rel;
+ info->src_path = src_rel; /* May be NULL, if outside RA session scope */
info->dst_path = dst_rel;
svn_hash_sets(action_hash, info->dst_path, info);
