[MERGE] Fix hg plugin for recent bzr.dev

[Jelmer Vernooij]

On Tue, 2006-06-13 at 20:36 +0200, Erik Bågfors wrote:
> 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'
Try a more recent version of bzr.dev. The non-bzr-control-dirs branch
has been merged a few hours ago and provides
BzrDirFormat.register_control_format()

Cheers,

Jelmer

-- 
Jelmer Vernooij <jelmer at samba.org> - http://samba.org/~jelmer/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060613/8b03e5aa/attachment.pgp