[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: Karl Fogel <kfogel_at_red-bean.com>
Date: Fri, 22 Aug 2008 19:39:56 -0400

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

> Modified: trunk/subversion/libsvn_client/merge.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_client/merge.c?pathrev=32643&r1=32642&r2=32643
> ==============================================================================
> --- trunk/subversion/libsvn_client/merge.c Fri Aug 22 11:51:12 2008 (r32642)
> +++ trunk/subversion/libsvn_client/merge.c Fri Aug 22 13:35:04 2008 (r32643)
> @@ -5142,7 +5142,8 @@ do_directory_merge(const char *url1,
> range.end = end_rev;
> break;
> }
> - start_rev = end_rev;
> + start_rev = get_most_inclusive_start_rev(children_with_mergeinfo,
> + is_rollback);
> end_rev = next_end_rev;
> }
> svn_pool_destroy(iterpool);
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: svn-unsubscribe_at_subversion.tigris.org
> For additional commands, e-mail: svn-help_at_subversion.tigris.org

---------------------------------------------------------------------
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-23 01:40:11 CEST

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