cannot bk resolve

Last friday I did a bk pull on my local mysql-4.1 tree, and then I
started to do a bk resolve. However, I aborted, since it was late and
I wanted to have a nice long weekend.

Today, I returned to my repository, and I get the following error:

[rodaz@moose mysql-4.1-rodaz]$ bk resolve
Using localhost:10.0 as graphical display
Verifying consistency of the RESYNC tree...
sane: not in a BitKeeper repository
{bk} {-r} {check} {-cR} failed.  Resolve not even started.
Warning: no BitKeeper/tmp/patch
resolve: RESYNC directory left intact.
====================================================

Now, what's going on here? I can't do bk pull:

[rodaz@moose mysql-4.1-rodaz]$ bk pull
Entire repository is locked by:
        RESYNC directory.
ERROR-Unable to lock repository for update.

So how can I get my tree into a sane state?

Thanks,
/Bjarke


-- 
Bjarke <rodaz@xxxxxxx>
http://www.diku.dk/hjemmesider/studerende/rodaz

"Hold jer væk med jeres forbandede ure. Jeg har jo ikke gjort jer
noget!"
        Urmager Ib Hubert Bundgaard


-- 
MySQL Internals Mailing List
For list archives: http://lists.mysql.com/internals
To unsubscribe:    
http://lists.mysql.com/internals?unsub=gcdmd-internals@xxxxxxxxxxx