# HG changeset patch
# User Simon Heimberg <simohe@besonet.ch>
# Date 2009-03-31 05:56:28
# Node ID 47b0a881638f4dfcb89e02ec1c46c8afc003774b
# Parent  f62482848d1b93565b0a005577c2b3dc558fc9f2

error: import LockError from correct module

diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -1063,7 +1063,7 @@ class localrepository(repo.repository):
                             wlock = self.wlock(False)
                             for f in fixup:
                                 self.dirstate.normal(f)
-                        except lock.LockError:
+                        except error.LockError:
                             pass
                     finally:
                         del wlock