[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: Stefan Sperling <stsp_at_elego.de>
Date: Sat, 10 Sep 2011 19:07:40 +0200

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.

> [1] Of course a path with explicit mergeinfo never inherits mergeinfo,
> what I mean here is simply the mergeinfo it would inherit *if* it had
> no explicit mergeinfo.

So non-inheritable ranges only apply to nodes which do not have their
own svn:mergeinfo. And any subtree mergeinfo overrides the mergeinfo
of its ancestors. Correct?

In which ways do you think automatic elision needs to be improved?

Do you think there is value in adding just 'svn mergeinfo --elide'
and keep using the present elision code?
Received on 2011-09-10 19:08:21 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.