[MERGE] Restore default stacking policy support
Aaron Bentley
aaron at aaronbentley.com
Thu Aug 28 17:54:09 BST 2008
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi all,
This patch restores support for stacking policies to the branch command.
I've reorganized the code a bit so that:
1. The target bzrdir has full control over the formats of branches and
repositories it creates.
2. Formats are only overridden if the user specifies --stack, not when
there is a default stacking policy.
Unfortunately, Branch.sprout likes to access the repository, and this
happens before stacking can be configured on the branch. I have
overridden this for now, but I think we probably need to look at a
different approach to Sprout. Perhaps extending RepositoryPolicies so
that they can be configured with all the requirements would make sense.
Other ideas are welcome.
In the process, I've discovered that --1.6-rich-root uses the wrong
serializer. This means that it cannot stack on top of rich-root-pack.
It also means that it may not reliably refuse inventories containing
subtrees. I have filed a bug here:
https://bugs.launchpad.net/bzr/+bug/262333
Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFIttgw0F+nu1YWqI0RAroUAJ9KgoZCLZY2tg5Vn1JghAv78UcJMQCfeHSr
nxP9BCcLmoFVMESPPNeIvCs=
=4vCQ
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: stacking-policy-3663.patch
Type: text/x-diff
Size: 21618 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080828/edcd2ce3/attachment-0001.bin
More information about the bazaar
mailing list