On May 11, 2011 12:33 PM, "Paul Burba" <ptburba_at_gmail.com> wrote:
>
> On Wed, May 11, 2011 at 3:25 AM, Greg Stein <gstein_at_gmail.com> wrote:
> > On Tue, May 10, 2011 at 14:14, <pburba_at_apache.org> wrote:
> >>...
> >> +++ subversion/trunk/subversion/libsvn_client/merge.c Tue May 10
18:14:22 2011
> >>...
> >> @@ -2989,14 +2997,15 @@ fix_deleted_subtree_ranges(const char *u
> >> svn_ra_session_t *ra_session,
> >> notification_receiver_baton_t *notify_b,
> >> merge_cmd_baton_t *merge_b,
> >> - apr_pool_t *pool)
> >> + apr_pool_t *result_pool,
> >> + apr_pool_t *scratch_pool)
> >> {
> >> int i;
> >> const char *source_root_url;
> >> - apr_pool_t *iterpool = svn_pool_create(pool);
> >> + apr_pool_t *iterpool = svn_pool_create(scratch_pool);
> >> svn_boolean_t is_rollback = revision2 < revision1;
> >>
> >> - SVN_ERR(svn_ra_get_repos_root2(ra_session, &source_root_url, pool));
> >> + SVN_ERR(svn_ra_get_repos_root2(ra_session, &source_root_url,
scratch_pool));
> >>
> >> /* NOTIFY_B->CHILDREN_WITH_MERGEINFO is sorted in depth-first order,
so
> >> start at index 1 to examine only subtrees. */
> >> @@ -3090,7 +3099,8 @@ fix_deleted_subtree_ranges(const char *u
> >> revision1, revision2,
> >>
child_primary_source_url,
> >> ra_session,
> >> - merge_b->ctx, pool));
> >> + merge_b->ctx,
result_pool,
> >> + iterpool));
> >> }
> >> }
> >>
> >
> > iterpool is constructured and used, but never cleared or destroyed.
>
> Hi Greg,
>
> Which iterpool are you referring to above? The one in
> fix_deleted_subtree_ranges I assume? That is cleared on line 3025 and
> destroyed right before the function returns on line 3107.
Oh... my fault! it just isn't in the diff context.Sorry about that!
Thanks for the new changes.
Cheers,
-g
Received on 2011-05-11 20:21:15 CEST