On Mon, 29 Oct 2007, C. Michael Pilato wrote:
> Daniel L. Rall wrote:
> > On Mon, 29 Oct 2007, kameshj@tigris.org wrote:
> >
> >> Author: kameshj
> >> Date: Mon Oct 29 06:02:21 2007
> >> New Revision: 27455
> >>
> >> Log:
> >> Code refactor.
> >>
> >> * subversion/libsvn_client/merge.c
> >> (svn_client_merge_peg3): Assign iteration independent 'merge_cmd_baton'
> >> members out of iteration loop.
> >> Call do_merge with FALSE for 'three way merge' rather than indirectly via
> >> merge_cmd_baton.
> >
> > This is inscrutable -- FALSE what?
>
> I think he means, "Pass FALSE as the value of the three_way_merge parameter
> of do_merge() instead of consulting the merge_cmd_baton", rather the way the
> diff indicates:
Sure, I looked at the diff and understand what was intended. My point is,
how can you tell that from the log message? The idea with a log message is
to get a summary of the change *without* looking at the diff. :P
> >> @@ -4663,7 +4669,7 @@
> >> URL2,
> >> range.end,
> >> is_rollback,
> >> - merge_cmd_baton.target_missing_child,
> >> + FALSE,
> >> target_wcpath,
> >> adm_access,
> >> depth,
- application/pgp-signature attachment: stored
Received on Mon Oct 29 18:45:38 2007