I suggested here [0] to write a decorator that checks for lock existence before calling functions that require one (such as strip and some in dirstate). These are fixes based on its output. I'll send the decorator after the freeze is over. [0]: http://markmail.org/message/s4bshrb46uyuxdej