[MERGE] Fix hg plugin for recent bzr.dev

[Jelmer Vernooij]

On Tue, 2006-06-13 at 20:41 +0200, Erik Bågfors wrote:
> : [bagfors at zyrgelkwyt]$ ; hg log
> changeset:   0:c0ba1928dc3f
> tag:         tip
> user:        Erik Bågfors <erik at bagfors.nu>
> date:        Tue Jun 13 20:34:29 2006 +0200
> summary:     foo
> 
> : [bagfors at zyrgelkwyt]$ ; bzr log
> bzr: ERROR: exceptions.TypeError: bad operand type for unary -
>   at /home/bagfors/.bazaar/plugins/hg/__init__.py line 261
>   in get_revision
That should work and I have no problems running it here on any ccontrol
branches. Do you have mercurial 0.9 installed? If not, please file a
bugreport in launchpad (https://launchpad.net/products/bzr-hg/+filebug)

> : [bagfors at zyrgelkwyt]$ ; cd ../
> : [bagfors at zyrgelkwyt]$ ; bzr branch a b
> bzr: ERROR: exceptions.AttributeError: localrepository instance has no
> attribute 'wlock'
>   at /home/bagfors/.bazaar/plugins/hg/__init__.py line 70
>   in lock_write
The plugin is still very basic at this point. You can't create mercurial
branches yet (which 'bzr branch a b' will try to do).

See http://samba.org/~jelmer/bzr/bzr.ccontrol for a bzr branch created
from a mercurial branch.

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/fb49e728/attachment.pgp