[MERGE] 'bzr send' fails when using the DefaultMail client

[John Arbash Meinel]

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

Sending again with [MERGE]

- -------- Original Message --------
Subject: 'bzr send' fails when using the DefaultMail client
Date: Mon, 17 Mar 2008 15:33:47 -0500
From: John Arbash Meinel <john at arbash-meinel.com>
To: Bazaar <bazaar at lists.canonical.com>

Specifically, DefaultMail has:
    def compose_merge_request(self, to, subject, directive):

But it seems to be expecting the base class implementation:
    def compose_merge_request(self, to, subject, directive, basename=None):

Anyway, it means "bzr send" is broken in default. I normally don't use
it (I always use -o ... because I never bothered to set it up with
Thunderbird).

Anyway, the attached patch "fixes" it, but it doesn't add a test, which
we really should have.

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

iD8DBQFH3tZ9JdeBCYSNAAMRAmc7AKDZ6wtLx9dqISA2ki6gq81PQu1d4gCfYbzo
F7dGJh4hwRxQNa/4LOxblfc=
=opFa
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: send_default.patch
Type: text/x-diff
Size: 3251 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080317/fb43fdb3/attachment.bin