[MERGE] pull and merge commands can use merge directives

[Aaron Bentley]

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

Hi all,

This patch enables merge and pull to use merge directives, in addition
to branches or bundles.

If the directive contains a bundle, that is used to perform the merge or
pull.  Otherwise, the source_branch in the revision is used.

Unless the user overrides, the revision_id in the directive is used.

Additionally, it fixes directives to use utf8 revision ids and fixes the
patch_type detection to properly detect "--plain" merge directives.

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

iD8DBQFF9u7U0F+nu1YWqI0RAsbZAJ4g5J+MimU8kAHNp5dRu6sPxXC4AgCfah93
x95FmJB0RuqD7CUPAP7udBY=
=GZMd
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: merge-directive-manual.patch
Type: text/x-patch
Size: 12004 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070313/1ebc10f6/attachment-0001.bin