Merge directive format 2

[Aaron Bentley]

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

Hi all,

Since it looks sensible to strip bundle format 4 of all responsibility
for generating patches, I've gone an implemented merge directive format
2.  An example is attached.

It is strikingly similar to the first (hey, no one complained about the
first!), and to 0.9 bundles.  But it's divided into three parts:
1. patch-rio parameters, like revision_id, source_branch, etc.
2. An optional patch "preview", which follows the line "# Begin patch".
3. An optional bundle, which follows the line "# Begin bundle"

Some notes about the optional bits:
Either a source branch or a bundle is always included a merge directive.
 Both may be included.

If a preview patch is provided, then the client should verify that the
requested merge actually matches the preview.

It is theoretically possible to have a merge directive with a bundle but
no preview patch, but the UI and API don't currently support that.

Also, I'm realizing that the patch-rio section doesn't have to go at the
top.  It could follow the patch, for example.  Does anyone want to
change that?

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

iD8DBQFGey0w0F+nu1YWqI0RAjGxAJ9JbeyRtf8LtO/fqcCwkDbqgedAbgCeJ5bJ
cHij5xt/5SYcEg2vX/vScX8=
=6IXr
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: md2.patch
Type: text/x-patch
Size: 4117 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070621/92f0a0b0/attachment.bin