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

Re: [PATCH] no mergeinfo on 'mergeinfo NON-affecting' wc-to-wc copy

From: Danil Shopyrin <danil_at_visualsvn.com>
Date: Wed, 10 Sep 2008 20:44:10 +0400

> Sure. My point was that if check_mergeinfo_affecting() returns FALSE,
> then we later redo some of the work that it does (like getting
> mergeinfo for the source). I'd like to see the
> avoid-setting-empty-mergeinfo logic merged into
> propagate_mergeinfo_within_wc(), not kept separately.

I can provide improved patch.

>>> 1. Get the mergeinfo for the source. If it's explicit, not inherited,
>>> we're done, there's nothing to propagate, because the destination
>>> already has the same explicit mergeinfo as the source, as a result of
>>> the copy. Currently, propagate_mergeinfo_within_wc() calls
>>> calculate_target_mergeinfo(), we can replace this with a call to
>>> svn_client__get_wc_mergeinfo().
>>
>> We don't need this step. This check is performed 'automatically'.
>> Source and destination receive mergeinfo from different urls if the
>> source have explicit mergeinfo.
>
> You read both the source and the target's mergeinfo unconditionally.
> If the source has explicit mergeinfo, you don't have to read the
> destination's mergeinfo.

I agree that logic can be optimized (it haven't done to keep the patch
as simple as possible). I can improve the patch (especially if the
whole concept will be approved :).

--
Danil
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-09-10 18:44:21 CEST

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