subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1221263 - /subversion/trunk/subversion/libsvn_client/merge.c
Date Tue, 20 Dec 2011 14:02:20 GMT
Author: julianfoad
Date: Tue Dec 20 14:02:20 2011
New Revision: 1221263

URL: http://svn.apache.org/viewvc?rev=1221263&view=rev
Log:
* subversion/libsvn_client/merge.c:
  (merge_locked): Fix a pool lifetime bug. A follow-up to r1212524.

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

Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1221263&r1=1221262&r2=1221263&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Tue Dec 20 14:02:20 2011
@@ -9498,15 +9498,15 @@ merge_locked(const char *source1,
       APR_ARRAY_PUSH(merge_sources, merge_source_t *) = &source;
     }
 
-  /* Close our temporary RA sessions. */
-  svn_pool_destroy(sesspool);
-
   err = do_merge(NULL, NULL, merge_sources, target_abspath,
                  ancestral, related, same_repos,
                  ignore_ancestry, force, dry_run,
                  record_only, NULL, FALSE, FALSE, depth, merge_options,
                  &use_sleep, ctx, scratch_pool, scratch_pool);
 
+  /* Close our temporary RA sessions. */
+  svn_pool_destroy(sesspool);
+
   if (use_sleep)
     svn_io_sleep_for_timestamps(target_abspath, scratch_pool);
 



Mime
View raw message