subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pbu...@apache.org
Subject svn commit: r1101578 [1/2] - /subversion/trunk/subversion/libsvn_client/merge.c
Date Tue, 10 May 2011 18:14:22 GMT
Author: pburba
Date: Tue May 10 18:14:22 2011
New Revision: 1101578

URL: http://svn.apache.org/viewvc?rev=1101578&view=rev
Log:
Remove local subpools and instead use result_pool/scratch_pool paradigm in
libsvn_client/merge.c.

Not essential for 1.7, but something I've wanted to do for a long time (and
want in before we branch :-)

* subversion/libsvn_client/merge.c

  (adjust_deleted_subtree_ranges,
   filter_merged_revisions,
   normalize_merge_sources,
   do_merge,
   find_unmerged_mergeinfo,
   calculate_left_hand_side):
   Replace single pool arg with result and scratch pools.  Remove local
   subpool and use scratch pool or local iterpool as appropriate.

  (adjust_deleted_subtree_ranges,
   calculate_remaining_ranges,
   populate_remaining_ranges):
   Replace single pool arg with result and scratch pools.

  (do_file_merge,
   do_directory_merge):
   Make sole pool argument a scratch pool.

  (merge_cousins_and_supplement_mergeinfo): Make sole pool argument a scratch
   pool.  Start using a subpool we can clear between the three merges this
   function performs.

  (merge_locked,
   merge_reintegrate_locked,
   merge_peg_locked):
   Update calls to the above functions which now take two pools.

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


Mime
View raw message