svn commit: r1450341 - /subversion/trunk/subversion/libsvn_client/copy.c

[rhuijben]

Author: rhuijben
Date: Tue Feb 26 18:33:04 2013
New Revision: 1450341

URL: http://svn.apache.org/r1450341
Log:
* subversion/libsvn_client/copy.c
  (wc_to_repos_copy): Temporarily revert the introduction of the session pool
    of r1450279 in an attempt to unbreak the javahl tests. Do this by simply
    setting the session pool to the provided scratch pool.

Modified:
    subversion/trunk/subversion/libsvn_client/copy.c

Modified: subversion/trunk/subversion/libsvn_client/copy.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/copy.c?rev=1450341&r1=1450340&r2=1450341&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/copy.c (original)
+++ subversion/trunk/subversion/libsvn_client/copy.c Tue Feb 26 18:33:04 2013
@@ -1230,7 +1230,7 @@ wc_to_repos_copy(const apr_array_header_
   apr_array_header_t *new_dirs = NULL;
   apr_hash_t *commit_revprops;
   svn_client__copy_pair_t *first_pair;
-  apr_pool_t *session_pool = svn_pool_create(scratch_pool);
+  apr_pool_t *session_pool = scratch_pool; /*svn_pool_create(scratch_pool); */
   int i;
 
   /* Find the common root of all the source paths */
@@ -1474,7 +1474,7 @@ wc_to_repos_copy(const apr_array_header_
 #endif
 
   /* Close the initial session, to reopen a new session with commit handling */
-  svn_pool_clear(session_pool);
+  /*svn_pool_clear(session_pool);*/
 
   /* Open a new RA session to DST_URL. */
   SVN_ERR(svn_client__open_ra_session_internal(&ra_session, NULL, top_dst_url,
@@ -1501,7 +1501,7 @@ wc_to_repos_copy(const apr_array_header_
             _("Commit failed (details follow):"));
 
   svn_pool_destroy(iterpool);
-  svn_pool_destroy(session_pool);
+  /*svn_pool_destroy(session_pool);*/
 
   return SVN_NO_ERROR;
 }