subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pbu...@apache.org
Subject svn commit: r1209183 - /subversion/trunk/subversion/libsvn_client/merge.c
Date Thu, 01 Dec 2011 18:55:03 GMT
Author: pburba
Date: Thu Dec  1 18:55:03 2011
New Revision: 1209183

URL: http://svn.apache.org/viewvc?rev=1209183&view=rev
Log:
* subversion/libsvn_client/merge.c
  (record_mergeinfo_for_dir_merge): Rename a generic 'pool' argument to
   'scratch_pool', since that's what it is.


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=1209183&r1=1209182&r2=1209183&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Thu Dec  1 18:55:03 2011
@@ -7626,6 +7626,8 @@ flag_subtrees_needing_mergeinfo(svn_bool
 
    DEPTH, NOTIFY_B, MERGE_B, and SQUELCH_MERGEINFO_NOTIFICATIONS are all
    cascaded from do_directory_merge's arguments of the same names.
+
+   SCRATCH_POOL is used for temporary allocations.
 */
 static svn_error_t *
 record_mergeinfo_for_dir_merge(svn_mergeinfo_catalog_t result_catalog,
@@ -7635,7 +7637,7 @@ record_mergeinfo_for_dir_merge(svn_merge
                                svn_boolean_t squelch_mergeinfo_notifications,
                                notification_receiver_baton_t *notify_b,
                                merge_cmd_baton_t *merge_b,
-                               apr_pool_t *pool)
+                               apr_pool_t *scratch_pool)
 {
   int i;
   svn_boolean_t is_rollback = (merged_range->start > merged_range->end);
@@ -7645,7 +7647,7 @@ record_mergeinfo_for_dir_merge(svn_merge
      merges, minus any unresolved conflicts and skips. */
 
   /* We need a scratch pool for iterations below. */
-  apr_pool_t *iterpool = svn_pool_create(pool);
+  apr_pool_t *iterpool = svn_pool_create(scratch_pool);
 
   svn_merge_range_t range = *merged_range;
 



Mime
View raw message