Author: julianfoad
Date: Tue Apr 3 12:18:08 2012
New Revision: 1308841
URL: http://svn.apache.org/viewvc?rev=1308841&view=rev
Log:
* subversion/libsvn_client/merge.c
(filter_self_referential_mergeinfo): Don't leave the repository info
uninitialized in a svn_client__pathrev_t.
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=1308841&r1=1308840&r2=1308841&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Tue Apr 3 12:18:08 2012
@@ -958,6 +958,9 @@ filter_self_referential_mergeinfo(apr_ar
ctx, 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,
+ &target_base.repos_uuid,
+ ctx->wc_ctx, target_abspath, pool,
pool));
adjusted_props = apr_array_make(pool, (*props)->nelts, sizeof(svn_prop_t));
iterpool = svn_pool_create(pool);
