[PATCH] add type selection to merge

[Aaron Bentley]

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

Hi all,

Building on my previous patches, this patch adds the ability to select
the type of merge on the commandline.

There's a bit of a conflict here, in that ideally the usage message
would include the supported merge types.  But since the usage message is
the doctext, it would be hard to instantiate the class without importing
merge.  I guess we could do something like:

class cmd_merge:
    def _get_doctext(self)

    __doc__ = property(_get_doctext)

That looks pretty gross to me.

So currently, to list the merge types, you do 'bzr merge --merge-type
foo' and it will tell you what you should have typed instead.

Also, what happend to bzr $COMMAND --help?  It seems the only way to get
a usage message right now is bzr help $COMMAND.

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

iD8DBQFC6nL10F+nu1YWqI0RAvffAJwOtVG/qRCfVIJTItOmHa5Q6X0pTgCdHsXL
KWcpk7EEU53j8BJ0zLTQYOc=
=wClX
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: merge-type.patch
Type: text/x-patch
Size: 4015 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20050729/2914a8eb/attachment.bin