Getting rid of RootEntry?

[John A Meinel]

Aaron Bentley wrote:
> John A Meinel wrote:
>>> Aaron Bentley wrote:
>>>> With by-value nested trees, the nested root must be an
>>>> InventoryDirectory, which will mean we have to address this issue.
> 
>>> 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'.
> 
> What I mean is that after you do "bzr merge -r 0.. --into-subdir foo"
> (or possibly "bzr graft $BRANCH --into-subdir foo"), foo will be an
> InventoryDirectory.  Lots and losts of things would break if we made foo
> a RootEntry.  I'm not sure whether that's what you meant.
> 
> What I mean is when you have a branch in which foo is an
> InventoryDirectory, you can't do "bzr diff . $BRANCH", because the types
> differ ("root directory" vs "directory").
> 
> Aaron

I guess the definition of 'InventoryDirectory' is what is confusing me.
I'm guessing you mean that 'foo' is now just marked in the inventory as
a directory. I thought you meant our discussion about splitting the
inventory up by directory. And that the new entry had to have a specific
inventory associated with it, or something like that.

Yes, 'root directory' == 'directory' is an issue. As is the fact that
currently all branches have a root directory with id TREE_ROOT.

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/7caa4533/attachment.pgp