[MERGE][0.15] Handle empty merge directive texts

[Aaron Bentley]

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

Hi all,

I finally got a chance to investigate why Bundle Buggy dropped Robert's
merge request "[MERGE] build support for pyrex/C modules".

As it turns out, there's a bug in the handling of invalid merge
directives: empty merge directives cause an IndexError to be raised.

Empty merge directives are invalid, of course, but the code that tries
to raise NotAMergeDirective tries to include the first line in that
error.  When there's no first line, an IndexError is raised.

This bundle fixes that, and I think it's obvious enough to include in
Bazaar 0.15.

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

iD8DBQFGA01p0F+nu1YWqI0RAmO4AJ9mFppNuuiNPSaDYk0DI653nY2BaACfXrC7
SQvkWBY/qfT+xz0Hz90MqP8=
=5g/Y
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: emtpy-merge-directive.patch
Type: text/x-patch
Size: 1881 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070322/58562059/attachment-0001.bin