# HG changeset patch
# User Martin Geisler <mg@daimi.au.dk>
# Date 1238533871 -7200
# Node ID 072df47d84c16d432bc4f041194184901fea1ac2
# Parent  0796c8862bee74ba62ca0b2cb0eda496aff282c2# Parent  47b0a881638f4dfcb89e02ec1c46c8afc003774b
merge with -stable

diff -r 0796c8862bee -r 072df47d84c1 mercurial/localrepo.py
--- a/mercurial/localrepo.py	Tue Mar 31 22:48:16 2009 +0200
+++ b/mercurial/localrepo.py	Tue Mar 31 23:11:11 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