Mercurial > public > mercurial-scm > hg-stable

diff mercurial/localrepo.py @ 7929:47b0a881638f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
error: import LockError from correct module
author Simon Heimberg <simohe@besonet.ch>
date Tue, 31 Mar 2009 07:56:28 +0200
parents 89e05c02a4af
children 072df47d84c1
line wrap: on
line diff
--- 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