[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: Vlad Georgescu <vgeorgescu_at_gmail.com>
Date: Wed, 10 Sep 2008 18:51:21 +0300

On Wed, Sep 10, 2008 at 5:57 PM, Paul Burba <ptburba_at_gmail.com> wrote:
> On Wed, Sep 10, 2008 at 9:13 AM, Vlad Georgescu <vgeorgescu_at_gmail.com> wrote:
[...]
>> In propagate_mergeinfo_within_wc(), we need to do the following:
>>
>> 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.
>
> Hi Vlad,
>
> Agreed, but doesn't this already work this way?

As far as I can tell from looking at the code, we simply read the
source's mergeinfo and add it to the destination's (thus causing the
destination's mergeinfo to be needlessly rewritten with the same value
if the source had explicit mergeinfo).

>
>> Currently, propagate_mergeinfo_within_wc() calls
>> calculate_target_mergeinfo(), we can replace this with a call to
>> svn_client__get_wc_mergeinfo().
>> 2. Figure out which path the destination inherits mergeinfo from, if any.
>
> How do we account for mixed-revision working copies? Do we give up
> and set empty mergeinfo in that case or do you think it can be worked
> around?

I ... don't know. I'll have to think about this.

-- 
Vlad
---------------------------------------------------------------------
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 17:51:36 CEST

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