--- a/hg	Mon May 23 22:14:41 2005 -0800
+++ b/hg	Tue May 24 20:29:38 2005 -0800
@@ -431,7 +431,7 @@
                 errors += 1
         try:
             changes = repo.changelog.read(n)
-        except Error, inst:
+        except Exception, inst:
             ui.warn("unpacking changeset %s: %s\n" % (short(n), inst))
             errors += 1
             
@@ -508,8 +508,8 @@
             # verify contents
             try:
                 t = fl.read(n)
-            except Error, inst:
-                ui.warn("unpacking file %s %s: %s\n" % (f, short(n), inst))
+            except Exception, inst:
+                ui.warn("unpacking file %s %s: %s\n" % (f, hg.short(n), inst))
                 errors += 1
             
             # verify parents