Author: julianfoad
Date: Thu Apr 12 09:18:54 2012
New Revision: 1325167
URL: http://svn.apache.org/viewvc?rev=1325167&view=rev
Log:
* subversion/libsvn_client/merge.c
(filter_self_referential_mergeinfo): Use svn_wc__node_get_url() instead of
svn_client_url_from_path2(), because that's more clearly a direct
companion of the adjacent __node_get_base_rev and __node_get_repos_info()
calls, and this paves the way for combining those calls into one.
Modified:
subversion/trunk/subversion/libsvn_client/merge.c
Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1325167&r1=1325166&r2=1325167&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Thu Apr 12 09:18:54 2012
@@ -893,8 +893,8 @@ filter_self_referential_mergeinfo(apr_ar
if (is_added)
return SVN_NO_ERROR;
- SVN_ERR(svn_client_url_from_path2(&target_base.url, target_abspath,
- ctx, pool, pool));
+ SVN_ERR(svn_wc__node_get_url(&target_base.url, ctx->wc_ctx, target_abspath,
+ pool, pool));
SVN_ERR(svn_wc__node_get_base_rev(&target_base.rev, ctx->wc_ctx,
target_abspath, pool));
SVN_ERR(svn_wc__node_get_repos_info(&target_base.repos_root_url,
