versioned file branch

[Jan Hudec]

On Sun, Feb 05, 2006 at 13:08:47 +0100, Denys Duchier wrote:
> Jan Hudec <bulb at ucw.cz> writes:
> 
> > On Sat, Feb 04, 2006 at 12:37:55 -0600, John A Meinel wrote:
> >> I'm wondering if we shouldn't have 3 categories: transitive ancestors,
> >> non-transitive ancestors, and ghosts.
> >> [...]
> >
> > As far as I can see, ghost and transitive are orthogonal. Besides ghost is
> > a property of that revision while transitive/non-transitive is a property of
> > the parent-child relation.
> 
> Could you explain what a non-transitive ancestor is?

Also called 'picked' ancestor. It is an ancestor, that is cherry-picked
rather than merged, so while the changed introduced by that revision is
included, but changes introduced by it's parents are not. (So it's parents
don't become ancestors, so ancestry-relation based on this is not transitive.)

-- 
						 Jan 'Bulb' Hudec <bulb at ucw.cz>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060205/241df925/attachment.pgp