Trying out nested trees

Aaron Bentley aaron at aaronbentley.com
Wed Apr 29 20:00:54 BST 2009


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

Jelmer Vernooij wrote:
> I thought I'd give the current nested trees support a spin

Thanks for taking an interest.

> Overall, I really like how easy it is to work with subtrees;
> it's much more intuitive than svn externals or git submodules IMSNHO.

That's great!

> Adding a subtree without changing that subtree itself gives the
> following output during commit:
> 
> Committing to:
> /home/jelmer/tmp/subtree/                                      
> Committing to:
> /home/jelmer/tmp/subtree/specimen/                             
> aborting commit write group: PointlessCommit(No changes to commit)
> added specimen
> Committed revision 1.

I really wish this write group abort reporting has not been added.

> The PointlessCommit error for the subtree is a bit confusing.

It used to be swallowed silently, and I think it still should.
Preventing it would require look-before-you-leap.

> "bzr ls" also seems to not handle tree-references inventory entries yet
> (bzr: ERROR: unknown kind 'tree-reference')

I am adding support on a command-by-command basis:
http://bazaar-vcs.org/NestedTreeProgress

ls was not planned, but should be easy to support, once composite trees
land.

> Push seems to error out somehow trying to push the branch with the subtree:
> 
> ganieda:~/tmp/subtree% bzr.dev push ../subtree2
> bzr: ERROR: Not a branch: "/home/jelmer/tmp/subtree2/specimen/".

Push is on the TODO list.

> "bzr add <existing-branch>" is a noop, e.g. if foo is a branch:

This is the standard behavior of add.  If foo is a branch, we try to add
files *to* foo.

> $ bzr add foo
> $ bzr st
> unknown:
>   foo
> 
> I think this should probably warn the user that they want to use "bzr
> join --reference".

I don't think we want to be recommending nested trees until they're out
of beta, at least.  --reference is a hidden option for that reason.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkn4o+EACgkQ0F+nu1YWqI20+wCdFF0WmdUnwOVZ3Pptfi5lnrAM
z5wAn1RL17i5lZ+qupyj48z2diy08xBf
=SdMT
-----END PGP SIGNATURE-----



More information about the bazaar mailing list