Author: philip
Date: Tue Apr 27 10:03:20 2010
New Revision: 938388
URL: http://svn.apache.org/viewvc?rev=938388&view=rev
Log:
* subversion/libsvn_client/copy.c
(wc_to_repos_copy): Source path is already absolute so no need to convert.
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=938388&r1=938387&r2=938388&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/copy.c (original)
+++ subversion/trunk/subversion/libsvn_client/copy.c Tue Apr 27 10:03:20 2010
@@ -1328,10 +1328,8 @@ wc_to_repos_copy(svn_commit_info_t **com
svn_client__copy_pair_t *);
svn_client_commit_item3_t *item =
APR_ARRAY_IDX(commit_items, i, svn_client_commit_item3_t *);
- const char *src_abspath;
svn_pool_clear(iterpool);
- SVN_ERR(svn_dirent_get_absolute(&src_abspath, pair->src, iterpool));
/* Set the mergeinfo for the destination to the combined merge
info known to the WC and the repository. */
@@ -1344,7 +1342,7 @@ wc_to_repos_copy(svn_commit_info_t **com
svn_node_unknown, FALSE, FALSE,
pool, pool));
SVN_ERR(svn_client__parse_mergeinfo(&wc_mergeinfo, ctx->wc_ctx,
- src_abspath, iterpool, iterpool));
+ pair->src, iterpool, iterpool));
if (wc_mergeinfo && mergeinfo)
SVN_ERR(svn_mergeinfo_merge(mergeinfo, wc_mergeinfo, iterpool));
else if (! mergeinfo)
