Mercurial > public > mercurial-scm > hg-stable

diff mercurial/localrepo.py @ 7930:072df47d84c1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with -stable
author Martin Geisler <mg@daimi.au.dk>
date Tue, 31 Mar 2009 23:11:11 +0200
parents 553aa0cbeab6 47b0a881638f
children de377b1a9a84
line wrap: on
line diff
--- 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