Hi Paul. In short, I think I'm convinced by your argument. Thanks!
- Julian Paul Burba wrote: > On Thu, Sep 13, 2012 at 2:59 PM, Julian Foad wrote: >> I'm seeing something in the above diagram that may be troubling. It >> says that, in a mixed-rev WC, if I have no local mods, nevertheless >> the full set of properties (including inherited props) in effect on >> an ACTUAL node is different from the full set of props that are in >> effect on the correcponding BASE node. > > Yes, but when inheritance comes into play we are not dealing with > *single* nodes. We are talking about a tree[1] of nodes: Some target > 'root' node, possibly with explicit props, and the props that target > inherits from its parent nodes (some of which might be in the WC but > some which might be located in the repository), we are not dealing > with single nodes located entirely within the WC. So in a mixed-rev > WC we have an ACTUAL tree located entirely in the WC and a "BASE > tree", which might effectively extend beyond the root of the > repository. But this BASE tree, taken as a whole, doesn't correspond > to anything in the repository because of the mixed-revisions. > > Maybe this will make my thinking clearer: Say we have the WC described > by your diagram above (and assuming no local mods): > > REPOSITORY WC-BASE WC-ACTUAL > r10 r20 r30 (mixed-rev) > > parent (O) (O) (O) > | |\\_ | __ | __________________ > | | \_ | __ | ________ \ > | v v v v v > +-x (O) (O) (O) (@10) (O) > | | | | \_______ | > | v v v v v > +-doc (O) (O) (O) (@30) (O) > | | | \_ | ________ | > | v v v v v > +-README (O) (O) (O) (@20) (O) > > In practical terms you are concerned that, for example, 'svn pl -v > --show-inherited-props doc' might show different inherited props than > 'svn pl -v --show-inherited-props doc -rBASE' right? > > But the properties a BASE node inherits should always be the same no? > My intent was that all of the following would produce the same set of > inherited porperties for parent/x/doc[2] > > svn pl -v --show-inherited-props doc -rBASE > svn pl -v --show-inherited-props doc -r30 > svn pl -v --show-inherited-props ^/parent/x/do@30 > > IOW In terms of iprops, I see the mixed-rev/no-local-mod WC as > equivalent to a local mod as far as inherited properties in the ACTUAL > tree are concerned.
