[MERGE] Nested trees: Store tree-reference locations in the branch.

Aaron Bentley aaron at aaronbentley.com
Tue Apr 14 16:43:42 BST 2009


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

Hi all,

This patch implements a new branch type that can store the branch
locations of tree references.  This allows the branches of subtrees to
be stored in arbitrary locations.  This makes sense because subtrees
will often be separate projects.

The data is stored in the branch rather than in the tree, because it is
anticipated that this data will vary.  It will vary over time, as the
locations of external projects change.  It will vary across locations,
because some locations will have local mirrors that they prefer to use.

Like tags, this data is updated by branch, merge, pull, push, etc.
Unlike tags, there is no opportunity for conflicts, because if there are
two values, the local value is always preferred.  (See above about
varying across locations.)

I haven't yet implemented the "reference-location" command, but I intend
to do so.  It will be similar to the alias command, providing a way to
list, view and set reference locations.  For references with no current
path, an old path will be displayed, prefixed by "(deleted)".  To
support displaying old paths, tree_path is provided by the
reference_info API.

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

iEYEARECAAYFAknkryYACgkQ0F+nu1YWqI0iQwCggFprYejJH+hbyY1eZQZY6yfU
mzkAnRFG0+azbCwClnzyW7XLGju7JVcq
=OE44
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: branch-subtree-locations-4285.patch
Type: text/x-patch
Size: 36567 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20090414/6e8b737c/attachment-0001.bin 


More information about the bazaar mailing list