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

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

From: Paul Burba <ptburba_at_gmail.com>
Date: Mon, 25 Aug 2008 14:03:52 -0400

On Fri, Aug 22, 2008 at 7:39 PM, Karl Fogel <kfogel_at_red-bean.com> wrote:
> pburba_at_tigris.org writes:
>> Log:
>> Improve merge performance by not driving the merge editor for ranges
>> which don't need to be merged (which seems rather obvious).
>>
>> * subversion/libsvn_client/merge.c
>> (do_directory_merge): When updating the start revision after one
>> iteration of the merged report editor, don't simply set it to the end of
>> the previous range, but rather find the most inclusive. This prevents
>> us from needlessly contacting the repository and doing a diff where we
>> describe the entire target tree as *not* needing any of the requested
>> range. This can happen whenever we have mergeinfo with gaps in it for
>> the merge source.
>
> Wow. What a great log message -- but are you sure it wouldn't be even
> better as a comment in the code right there? :-)
>
> -Karl

My mistake, I had some changes to comment under "/* While END_REV is
valid, do the following:", but through some patch mismanagement I
didn't commit that part! Fixed as part of r32701.

Paul

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-08-25 20:04:07 CEST

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