Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
error: import LockError from correct module
authorSimon Heimberg <simohe@besonet.ch>
Tue, 31 Mar 2009 07:56:28 +0200
changeset 7929 47b0a881638f
parent 7921 f62482848d1b
child 7930 072df47d84c1
child 7970 fd22d7c7b302
child 8016 baaa832fd253
error: import LockError from correct module
mercurial/localrepo.py file | annotate | diff | comparison | revisions 
--- 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
mercurial