[MERGE] Merge directive format 2, Bundle format 4

[Aaron Bentley]

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

Robert Collins wrote:
> On Fri, 2007-06-29 at 17:24 -0400, Aaron Bentley wrote:
>> You should be able to set submit_branch in locations.conf.
> 
> I have a request. I'd like to be able to set a submit branch which is
> local but has a public_branch set for it.
> 
> That is, I have a local bzr.dev mirror which merge-directive should use
> to generate data, and I have a public_location set for that which
> merge-directive should use in the recorded meta data it outputs.

So you're saying you want this exposed in the UI somehow?  Because it's
already in the internals.

If you specify your local mirror of bzr.dev as the submit branch, and
you have set "http://bazaar-vcs.org/bzr/bzr.dev" as its public location,
 then "http://bazaar-vcs.org/bzr/bzr.dev" is used in the directive URL.

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

iD8DBQFGiIUY0F+nu1YWqI0RAkA3AJ9M5xgXyQExCn17hkE0RCbP8HF3cQCfUfXJ
7fg4uxBNeJnLo1KOEclQpII=
=n9zK
-----END PGP SIGNATURE-----