--- a/mercurial/localrepo.py Fri Mar 27 11:17:46 2009 -0400 +++ b/mercurial/localrepo.py Tue Mar 31 07:56:28 2009 +0200 @@ -1063,7 +1063,7 @@ wlock = self.wlock(False) for f in fixup: self.dirstate.normal(f) - except lock.LockError: + except error.LockError: pass finally: del wlock