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

Re: now with more agressive elision (was: [PATCH] svn mergeinfo --elide)

From: Paul Burba <ptburba_at_gmail.com>
Date: Sat, 10 Sep 2011 14:09:15 -0400

On Sat, Sep 10, 2011 at 1:11 PM, Stefan Sperling <stsp_at_elego.de> wrote:
> On Sat, Sep 10, 2011 at 07:07:40PM +0200, Stefan Sperling wrote:
>> On Sat, Sep 10, 2011 at 12:45:50PM -0400, Paul Burba wrote:
>> > ### This leaves us with a situation where r4 hasn't been merged
>> > ### to the branch:
>> >
>> >   trunk_at_1167503>svn st
>> >    M      branch
>> >    M      branch\B
>> >   M       branch\D\gamma
>> >
>> >   trunk_at_1167503>svn pl -vR
>> >   Properties on 'branch':
>> >     svn:mergeinfo
>> >       /A:2-4
>> >   Properties on 'branch\B':
>> >     svn:mergeinfo
>> >       /A/B:2-3
>>
>> > But your patch would elide[2] the mergeinfo on ^/branch/B and make it
>> > appear r4 was fully merged to ^/branch, which is clearly not the case.
>>
>> Quite right, it would only leave /A:2-4 on the 'branch' directory.
>> Thanks.
>
> Is the key problem here that the elision algorithm doesn't know (or
> care) whether r4 is operative on 'branch\B'?

Yes.

> It seems that if r4 is in-operative on 'branch\B' we could elide.
> And if it is, we cannot elide. Is this correct?

Yes again.

Paul
Received on 2011-09-10 20:09:48 CEST

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