[MERGE] Merge types are provided by a registry

[Aaron Bentley]

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

Hi all,

This bundle causes merge types to be provided by a registry.

It removes some public symbols without deprecation, but I'm confident
that no one is using them, because there are no plugins that provide
alternate merge types[1].

The one icky thing is that merge-type is a global option, so the
registry must be available (non-lazily) in bzrlib.options.  But
importing merge into bzrlib.options introduces circular imports.  So I
had to put the merge-type registry in bzrlib.options.

Plugins can register new merge types with
merge.get_merge_type_registry().register, etc.

Aaron

[1] the extmerge plugin is a very different beast.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFFyfxe0F+nu1YWqI0RAmSHAJsEYfxpxIHPWyvNNiQCPQI8XfRGswCeLI/G
Ky3RG3Kyw5xHo66Wr43Ki98=
=8aHT
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: merge-type-registry.patch
Type: text/x-patch
Size: 15370 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070207/eca3760f/attachment-0001.bin