svn commit: r1703371 - /subversion/branches/reuse-ra-session/subversion/libsvn_client/merge.c

[iv...@apache.org]

Author: ivan
Date: Wed Sep 16 09:16:28 2015
New Revision: 1703371

URL: http://svn.apache.org/r1703371
Log:
On 'reuse-ra-session' branch.

* subversion/libsvn_client/merge.c
  (ensure_ra_session_url): Update comment with link to patch with rework of
   RA session usage in merge code.

Modified:
    subversion/branches/reuse-ra-session/subversion/libsvn_client/merge.c

Modified: subversion/branches/reuse-ra-session/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/subversion/libsvn_client/merge.c?rev=1703371&r1=1703370&r2=1703371&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/subversion/libsvn_client/merge.c (original)
+++ subversion/branches/reuse-ra-session/subversion/libsvn_client/merge.c Wed Sep 16 09:16:28 2015
@@ -9653,7 +9653,10 @@ ensure_ra_session_url(svn_ra_session_t *
   if (! *ra_session || (err && err->apr_err == SVN_ERR_RA_ILLEGAL_URL))
     {
       svn_error_clear(err);
-      /* RA_CACHE TODO: release RA session */
+      /* RA_CACHE TODO: release RA session
+         The patch to rework RA session handling in merge is going to
+         be committed in trunk after merging:
+         http://svn.haxx.se/dev/archive-2015-02/0054.shtml */
       err = svn_client_open_ra_session2(ra_session, url, wri_abspath,
                                         ctx, pool, pool);
     }