Mercurial Mercurial > hg-stable / 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.
merge with -stable
authorMartin Geisler <mg@daimi.au.dk>
Tue, 31 Mar 2009 23:11:11 +0200
changeset 7930 072df47d84c1
parent 7928 0796c8862bee (current diff)
parent 7929 47b0a881638f (diff)
child 7931 026bcd12a0ad
merge with -stable
mercurial/localrepo.py file | annotate | diff | comparison | revisions 
--- 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
hg-stable