[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

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

From: C. Michael Pilato <cmpilato_at_collab.net>
Date: 2007-10-29 18:58:42 CET

Daniel L. Rall wrote:
> 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

Fair 'nuff. I "got it" without the diff, but then I've been hanging 'round
these parts of the code lately.

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

Received on Mon Oct 29 18:58:54 2007

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.