On Mon, Jun 25, 2012 at 07:54:39PM -0400, Greg Stein wrote:
> On Mon, Jun 25, 2012 at 4:50 PM, <stsp_at_apache.org> wrote:
> >...
> > +++ subversion/trunk/subversion/libsvn_client/switch.c Mon Jun 25 20:50:17 2012
> > @@ -94,8 +94,6 @@ switch_internal(svn_revnum_t *result_rev
> > : NULL;
> > /* Resolve conflicts post-switch for 1.7 and above API users. */
> > svn_boolean_t resolve_conflicts_post_switch = (ctx->conflict_func2 != NULL);
>
> Note the above line...
>
> >...
> > @@ -252,7 +239,10 @@ switch_internal(svn_revnum_t *result_rev
> > server_supports_depth,
> > diff3_cmd, preserved_exts,
> > svn_client__dirent_fetcher, &dfb,
> > - ctx->conflict_func2, ctx->conflict_baton2,
> > + resolve_conflicts_post_switch ?
> > + NULL : ctx->conflict_func2,
> > + resolve_conflicts_post_switch ?
> > + NULL : ctx->conflict_baton2,
>
> You may as well just pass NULL unconditionally. If
> resolve_conflicts_post_switch is FALSE, the the func is NULL.
>
> >...
>
> Cheers,
> -g
Right. I did so for update but forgot about it while modifying switch.
Received on 2012-06-26 10:35:17 CEST