[MERGE] Tweaks for merge directives

[Aaron Bentley]

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

Hi all,
This patch makes a few small changes to merge directives:

- - The merge directive header does not require a trailing \n

- - If the right merge directive header is not found, a
  NotAMergeDirective error is raised, rather than an AssertionError

- - If the submit branch has a public location, the merge directive will
  use that instead of the actual submit branch location.  This means
  that you can generate your directive against a local copy of the
  mainline, yet have the official location be reflected in the
  directive.

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

iD8DBQFF81xv0F+nu1YWqI0RAhU8AJ9AWpNsJmLbvXxeUHO58qqFO8DD3ACfVMBx
Ra+icIKFdwhhNMCqNYhZ2uk=
=iBg0
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: merge-directive-tweaks.patch
Type: text/x-patch
Size: 3729 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070310/3801c94f/attachment-0001.bin