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/04/27 12:03:21 UTC
svn commit: r938388 - /subversion/trunk/subversion/libsvn_client/copy.c
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)
Re: svn commit: r938388 - /subversion/trunk/subversion/libsvn_client/copy.c
Posted by Philip Martin <ph...@wandisco.com>.
Greg Stein <gs...@gmail.com> writes:
> I'd recommend changing the member name, or adding an assertion. Either
> of those will let callers know what's up with the source path.
r938406. The same member is an URL in other functions.
--
Philip
Re: svn commit: r938388 - /subversion/trunk/subversion/libsvn_client/copy.c
Posted by Greg Stein <gs...@gmail.com>.
On Tue, Apr 27, 2010 at 06:03, <ph...@apache.org> wrote:
> 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.
I'd recommend changing the member name, or adding an assertion. Either
of those will let callers know what's up with the source path.
Cheers,
-g