On Tue, Jul 19, 2011 at 17:51, <s...@apache.org> wrote: >... > * subversion/libsvn_client/merge.c > (log_noop_revs): The baton's pool is used in an iterpool pattern so it > must be cleared on each invocation of this function. > (remove_noop_subtree_ranges): Make the baton's pool a proper subpool > to avoid clearing unrelated data in log_noop_revs().
Why does the baton have a pool at all? The pool passed to log_noop_revs() *is* already a scratch_pool. If that pool is not getting cleared on each iteration, then we need to fix the caller. The log_baton shouldn't even have a pool, I think. I believe the above change is the wrong fix for this issue. The caller(s) should be corrected (and remove that spurious pool). Cheers, -g