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

WC-NG 3-trees description [was: '@BASE' vs. 'BASE tree']

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Mon, 15 Feb 2010 14:26:08 +0000

Any WC-NG folks prepared to comment on this? We should put this
description in note/wc-ng/... if it's OK.

- Julian

On Tue, 2010-02-09, I (Julian Foad) wrote:
> Hi, all. I've written up this brief definition of the WC-NG DB trees
> at
> <http://subversion.wandisco.com/wiki/index.php/WC-NG_trees_-_defining_BASE_and_WORKING_and_ACTUAL>. Could you all have a look and add to it or just mention to me anything that is worth noting or correcting. After a few rounds I'll move it to an in-tree document.
>
> In particular, one question for Greg:
[...]
> > > So the wc_db trees are something like
> > >
> > > * (the pristine one, known as BASE)
[...]
> > > * (the tree-changes, known as WORKING)
[...]
> > > * (the on-disk and in-property-storage stuff, known as ACTUAL)
> > >
> > > A description of the text-content and properties of any nodes whose
> > > text-content and/or properties are different from its WORKING version.
> > > Any node that has no such differences does not appear in this tree.
> >
> > Its WORKING node; or if none, then the BASE node.
>
> Sorry Greg, I didn't understand your comment there. Could you clarify?
>
> > The ACTUAL tree can also record tree conflicts for nodes that exist in
> > neither WORKING nor BASE.
Received on 2010-02-15 15:26:48 CET

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