Author: pburba
Date: Fri Jun 3 19:35:42 2011
New Revision: 1131160
URL: http://svn.apache.org/viewvc?rev=1131160&view=rev
Log:
Follow-up to issue #3896 reintegrate fixes in r1131095.
* subversion/libsvn_client/merge.c
(filter_self_referential_mergeinfo): Reparent the ra_session, if necessary,
before continuing.
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=1131160&r1=1131159&r2=1131160&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Fri Jun 3 19:35:42 2011
@@ -866,6 +866,12 @@ filter_self_referential_mergeinfo(apr_ar
{
svn_error_clear(err);
APR_ARRAY_PUSH(adjusted_props, svn_prop_t) = *prop;
+
+ /* If we reparented RA_SESSION above, put it back
+ to the original URL. */
+ if (old_url)
+ SVN_ERR(svn_ra_reparent(ra_session, old_url, iterpool));
+
continue;
}
else
