[MERGE] [0.90] Restore support for Merge directive 2 / 0.19

[Aaron Bentley]

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

Hi all,

I thought it wouldn't be too traumatic to change the format marker for
Merge Directive 2.  I was wrong.  Merge directives aren't as ephemeral
as they used to be.  They're now archived by Bundle Buggy, and this
change breaks Bundle Buggy pretty severely.

This patch just restores read-only support for the old format marker.
I'd like to get it into Bazaar 0.90 if possible.

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

iD8DBQFGvMyK0F+nu1YWqI0RAh9oAJ9RwXJPrtvdPEgU0Zp4Gt6FPcswnACcC6hL
DxNZOYxykdDYsVhYcPSF3/A=
=JN/n
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: support-old-directive-marker.patch
Type: text/x-patch
Size: 6374 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070810/c5a62487/attachment.bin