Getting rid of RootEntry?

[John A Meinel]

Aaron Bentley wrote:
> John A Meinel wrote:
>>> With the future work of having nested trees, we were thinking to have a
>>> new inventory type inside the parent tree. 
> 
> Yes, with by-reference nested trees, the nested root would be a new
> type, (e.g. NestedRoot).  A NestedRoot would have a revision, and
> possibly a checkout, branch, etc associated with it.  Mind you, it will
> only be a NestedRoot in the containing tree.  It would be the same type
> in its own tree.
> 
> With by-value nested trees, the nested root must be an
> InventoryDirectory, which will mean we have to address this issue.
> 
>>> But that doesn't mean it
>>> needs to be a distinct entry inside its own tree.
>>> Because of a desire to be able to merge branches, it seems like it would
>>> be nice to be able to move the root entry.
> 
> Yes, I've come to believe that.  (And yes, I know I dismissed the idea
> of moving the tree root as nonsense during my Arch days.)
> 
>>> We may want #3 anyway, but I'm okay with #1 for now.
> 
> I know where you're coming from.  In some ways, it's nicer to permit
> type changes, but it does introduce a whole bunch of new edge cases.
> I'll note that the TreeTransform code does handle type changes, because
> revert must be able to revert a type change.
> 
> Aaron

Then I think you and I are on the same page here.

I'm not sure why 'the nested root must be an InventoryDirectory', since
we have given a reasonable method, by which the current format can
support by-value nested merges. (other than the inventory entries not
having a proper parent_id). The current 'bzr merge -r 0..' code handles
the merge just fine, we would just need a '--into-subdir foo'.

But yes, I think #1 is a fine way to handle moving the tree root, so
that we can have by-value nested trees.

John
=:->

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 249 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060116/d9b998be/attachment.pgp