Bundle Buggy supports merge directives (was: [MERGE] Tweaks for merge directives)

[Aaron Bentley]

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

Bundle Buggy wrote:
> Bundle Buggy has detected this merge request.
> http://bundlebuggy.aaronbentley.com/request/%3C45F35C6F.3080501%40utoronto.ca%3E

I have also added support for merge directives to Bundle Buggy, as you
can see from this request's URL:

http://bundlebuggy.aaronbentley.com/request/%3C45F35C6F.3080501%40utoronto.ca%3E

The message contains a diff, no determined the revision id.  The other
new thing is that it displays the source branch.

Also, I've tweaked the gpg signt a bundle, but BundleBuggy marks
tracking as "auto", because it determined the revision id.  The other
new thing is that it displays the source branch.

One drawback of diff merge directives is that they don't mark earlier
versions as "superseded".  That will require querying the source branch.

Also, I've tweaked the gpg signature-stripping code to fix leading
hyphens that gpg mutilates.

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

iD8DBQFF82Kq0F+nu1YWqI0RAp4sAKCA5B6GDhn++MGJeuZ+4BmGPc3gigCfYqup
EKxT3ClYgsCOe9NcllpMaUI=
=XDb7
-----END PGP SIGNATURE-----