On Sat, May 12, 2012 at 7:11 PM, <[email protected]> wrote: >... > +++ subversion/trunk/subversion/libsvn_wc/conflicts.c Sat May 12 23:11:18 2012 >... > +conflict_status_walker(void *baton, > + const char *local_abspath, > + const svn_wc_status3_t *status, > + apr_pool_t *scratch_pool) > { > + struct conflict_status_walker_baton *cswb = baton; > + svn_wc__db_t *db = cswb->db; > + > const apr_array_header_t *conflicts; > apr_pool_t *iterpool = svn_pool_create(scratch_pool); > int i; > svn_boolean_t resolved = FALSE; > > + if (!status->conflicted) > + return SVN_NO_ERROR;
iterpool is created before the fast-path exit. I'd suggest delaying it. (possibly along with those other assignments) >... > + SVN_ERR(svn_wc_walk_status(wc_ctx, local_abspath, depth, FALSE, FALSE, > TRUE, > + NULL, conflict_status_walker, &cswb, > + cancel_func, cancel_baton, > + scratch_pool)); Some comments on those arguments? I can't tell what they're doing, and as you noted in the log message, it is important that this is not performing text mod checks. >... Cheers, -g
