--- a/mercurial/hgweb/server.py Mon Mar 23 15:04:26 2009 -0400
+++ b/mercurial/hgweb/server.py Fri Apr 03 11:50:42 2009 -0500
@@ -275,7 +275,7 @@
def __init__(self, *args, **kwargs):
if self.address_family is None:
- raise RepoError(_('IPv6 not available on this system'))
+ raise error.RepoError(_('IPv6 not available on this system'))
super(IPv6HTTPServer, self).__init__(*args, **kwargs)
if ssl_cert:
--- a/mercurial/localrepo.py Mon Mar 23 15:04:26 2009 -0400
+++ b/mercurial/localrepo.py Fri Apr 03 11:50:42 2009 -0500
@@ -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