Getting rid of RootEntry?

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

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
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFDy7xW0F+nu1YWqI0RAgiWAJwKFapmm09jz/T942WA8D4FpwYWsgCffnMP
B6J9HlFWrjQwAtruy406VEI=
=KIE2
-----END PGP SIGNATURE-----