On Mon, May 03, 2010 at 08:41:14PM -0400, Greg Stein wrote: > On Mon, May 3, 2010 at 18:01, <dan...@apache.org> wrote: > >... > > +++ subversion/trunk/subversion/libsvn_wc/util.c Mon May 3 22:01:53 2010 > >... > > @@ -565,6 +567,12 @@ svn_wc__status2_from_3(svn_wc_status2_t > > SVN_ERR(svn_wc__get_entry(&entry, wc_ctx->db, local_abspath, TRUE, > > svn_node_unknown, FALSE, result_pool, > > scratch_pool)); > > + > > + SVN_ERR(svn_wc__db_op_read_tree_conflict(&tree_conflict, wc_ctx->db, > > + local_abspath, result_pool, > > + scratch_pool)); > > You don't need 'tree_conflict' to persist, so both pools can be scratch_pool. > > > + old_tree_conflict = svn_wc__cd2_to_cd(tree_conflict, scratch_pool); > > But you're returning this one, so that should be result_pool.
Committed in r940982. Thanks, Daniel
