You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2012/06/01 17:09:36 UTC
svn propchange: r1345158 - svn:log
Author: rhuijben
Revision: 1345158
Modified property: svn:log
Modified: svn:log at Fri Jun 1 15:09:36 2012
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Fri Jun 1 15:09:36 2012
@@ -6,8 +6,8 @@ This patch relies on the ra.c fix in r13
sometimes opened a working copy that would try to update the dav cache.
* subversion/libsvn_client/merge.c
- (svn_client_open_ra_session): Use svn_client_open_ra_session() as we only
- use the standard options.
+ (ensure_ra_session_url): Use svn_client_open_ra_session() as we only use the
+ standard options.
(do_merge): Accept a ra_session to help avoiding creating another session.
(merge_cousins_and_supplement_mergeinfo,
merge_locked): Pass session.