Author: pburba Date: Mon Apr 5 15:35:53 2010 New Revision: 930880 URL: http://svn.apache.org/viewvc?rev=930880&view=rev Log: On the 1.6.x-issue-3242-partial-v2 branch: Merge a missing piece of r879762 from ^/subversion/branches/issue-3242-dev, which was not properly backported to the ^/subversion/branches/1.6.x-issue-6242-partial branch in r916089.
See http://svn.haxx.se/dev/archive-2010-04/0054.shtml for a full explanation. * subversion/libsvn_client/mergeinfo.c (get_mergeinfo): Without this bit of r879762, we always ask for the mergeinfo for a path relative to a RA session which is rooted at the path itself, and therefore always fail. Modified: subversion/branches/1.6.x-issue-3242-partial-v2/subversion/libsvn_client/mergeinfo.c Modified: subversion/branches/1.6.x-issue-3242-partial-v2/subversion/libsvn_client/mergeinfo.c URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue-3242-partial-v2/subversion/libsvn_client/mergeinfo.c?rev=930880&r1=930879&r2=930880&view=diff ============================================================================== --- subversion/branches/1.6.x-issue-3242-partial-v2/subversion/libsvn_client/mergeinfo.c (original) +++ subversion/branches/1.6.x-issue-3242-partial-v2/subversion/libsvn_client/mergeinfo.c Mon Apr 5 15:35:53 2010 @@ -862,6 +862,7 @@ get_mergeinfo(svn_mergeinfo_t *mergeinfo if (svn_path_is_url(path_or_url)) { const char *repos_rel_path; + const char *old_session_url; SVN_ERR(svn_client__open_ra_session_internal(&ra_session, path_or_url, NULL, NULL, NULL, FALSE, @@ -872,6 +873,8 @@ get_mergeinfo(svn_mergeinfo_t *mergeinfo SVN_ERR(svn_client__path_relative_to_root(&repos_rel_path, path_or_url, *repos_root, FALSE, NULL, NULL, subpool)); + SVN_ERR(svn_client__ensure_ra_session_url(&old_session_url, ra_session, + *repos_root, subpool)); SVN_ERR(svn_client__get_repos_mergeinfo(ra_session, mergeinfo, repos_rel_path, rev, svn_mergeinfo_inherited, FALSE,
