[MERGE] Tweaks for merge directives

[John Arbash Meinel]

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

Aaron Bentley wrote:
> Hi all,
> This patch makes a few small changes to merge directives:
> 
> - The merge directive header does not require a trailing \n

What about following the rule that Bundles and patches do, which is that
they will move through lines until they find one which matches, and only
if they make it to the end will it raise an error. (Bundle also tries to
look for things that are close, so it can raise a
UnsupportedBundleVersion sort of error, rather than just NotABundle).

It means that people can include them inline in an email (which was part
of what Bundles were meant to support, and Merge directives are somewhat
similar), without causing confusion.

> 
> - 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

John
=:->

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

iD8DBQFF9CJ8JdeBCYSNAAMRAqCwAJ9zORdBiqGMiDjoJTaf/hmkDkqK1ACfa3nE
gHfBP0WcjxzeHQg/SJMSCZc=
=+7Am
-----END PGP SIGNATURE-----