[MERGE] Fix hg plugin for recent bzr.dev

[Erik Bågfors]

I tried this for the first time (the hg plugin).

But I just get errors
bzr: WARNING: Unable to load plugin 'hg' from '/home/bagfors/.bazaar/plugins'

in .bzr.log

load plugin (None, '/home/bagfors/.bazaar/plugins/hg', ('', '', 5))
[21741] Tue 20:34:36.184 WARNING: Unable to load plugin 'hg' from
'/home/bagfors/.bazaar/plugins'
Traceback (most recent call last):
  File "/home/bagfors/src/bzr/bzr.dev/bzrlib/plugin.py", line 161, in
load_from_dirs
    plugin = imp.load_module('bzrlib.plugins.' + name,
  File "/home/bagfors/.bazaar/plugins/hg/__init__.py", line 484, in ?
    bzrlib.bzrdir.BzrDirFormat.register_control_format(HgBzrDirFormat)
AttributeError: type object 'BzrDirFormat' has no attribute
'register_control_format'


/Erik

On 6/13/06, Jelmer Vernooij <jelmer at samba.org> wrote:
> Hi,
>
> The commit builder changes removed InventoryEntry._add_text_to_weave(),
> on which the Mercurial plugin depended. Fix attached.
>
> Mergeable from http://samba.org/~jelmer/bzr/hg/ or just let me know
> whether I can push it to the shared branch.
>
> Cheers,
>
> Jelmer
>
> --
> Jelmer Vernooij <jelmer at samba.org> - http://samba.org/~jelmer/
>
>
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.3 (GNU/Linux)
>
> iD8DBQFEjsvOPa9Uoh7vUnYRApY2AJ966R06rhyEufgl2NCZvuMQ5hwUyQCgk9Wj
> 2iJHaViO5dCMv9W1vbCPtfE=
> =lAKG
> -----END PGP SIGNATURE-----
>
>
>
>