Re: ra_svn failure over ssh on release branch.

Michael Price <michael.price@acm.org> writes:

> Merge test 5 is failing for me over ra_svn via an ssh tunnel. The
> relevant portion of tests.log is attached. Using release branch
> http://svn.collab.net/repos/svn/branches/release-0.21

Try the following patch. No, I don't know why it appears to make a
difference--there is probably some underlying bug.

* subversion/libsvn_client/diff.c (do_single_file_merge): Only use one
  RA session.

Index: subversion/libsvn_client/diff.c
===================================================================
--- subversion/libsvn_client/diff.c (revision 5622)
+++ subversion/libsvn_client/diff.c (working copy)
@@ -1008,7 +1008,7 @@
   const char *mimetype1, *mimetype2;
   svn_string_t *pval;
   apr_array_header_t *propchanges;
- void *ra_baton, *session1, *session2;
+ void *ra_baton, *session;
   svn_ra_plugin_t *ra_lib;
   svn_wc_notify_state_t prop_state = svn_wc_notify_state_unknown;
   svn_wc_notify_state_t text_state = svn_wc_notify_state_unknown;
@@ -1034,24 +1034,19 @@
 
   SVN_ERR (svn_ra_get_ra_library (&ra_lib, ra_baton, URL1, pool));
 
- SVN_ERR (svn_client__open_ra_session (&session1, ra_lib, URL1, auth_dir,
+ SVN_ERR (svn_client__open_ra_session (&session, ra_lib, URL1, auth_dir,
                                         NULL, NULL, FALSE, TRUE,
                                         merge_b->ctx, pool));
   SVN_ERR (svn_client__get_revision_number
- (&rev1, ra_lib, session1, revision1, NULL, pool));
- SVN_ERR (ra_lib->get_file (session1, "", rev1, fstream1,
+ (&rev1, ra_lib, session, revision1, NULL, pool));
+ SVN_ERR (ra_lib->get_file (session, "", rev1, fstream1,
                              NULL, &props1, pool));
 
   /* ### heh, funny. we could be fetching two fulltexts from two
      *totally* different repositories here. :-) */
-
- SVN_ERR (svn_ra_get_ra_library (&ra_lib, ra_baton, merge_b->url, pool));
- SVN_ERR (svn_client__open_ra_session (&session2, ra_lib, merge_b->url,
- auth_dir, NULL, NULL, FALSE,
- TRUE, merge_b->ctx, pool));
   SVN_ERR (svn_client__get_revision_number
- (&rev2, ra_lib, session2, merge_b->revision, NULL, pool));
- SVN_ERR (ra_lib->get_file (session2, "", rev2, fstream2, NULL,
+ (&rev2, ra_lib, session, merge_b->revision, NULL, pool));
+ SVN_ERR (ra_lib->get_file (session, "", rev2, fstream2, NULL,
                              &props2, pool));
 
   status = apr_file_close (fp1);

-- 
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org