Re: svn commit: r27455 - trunk/subversion/libsvn_client

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:

>> @@ -4663,7 +4669,7 @@
>> URL2,
>> range.end,
>> is_rollback,
>> - merge_cmd_baton.target_missing_child,
>> + FALSE,
>> target_wcpath,
>> adm_access,
>> depth,

-- 
C. Michael Pilato <cmpilato@collab.net>
CollabNet   <>   www.collab.net   <>   Distributed Development On Demand