# HG changeset patch
# User Benoit Boissinot <benoit.boissinot@ens-lyon.org>
# Date 1206901895 -7200
# Node ID 47f4a47161b4e11ffec991e9c56e67016327425e
# Parent  3f5f23ba18bcb37a9bc4b69f08ce477f1ecad8e0# Parent  1a726377c3127c0c94f74740c6c7847971d64ac8
merge with crew

diff -r 1a726377c312 -r 47f4a47161b4 mercurial/localrepo.py
--- a/mercurial/localrepo.py	Sun Mar 30 20:25:22 2008 +0200
+++ b/mercurial/localrepo.py	Sun Mar 30 20:31:35 2008 +0200
@@ -2075,7 +2075,7 @@
         l = fp.readline()
         try:
             total_files, total_bytes = map(int, l.split(' ', 1))
-        except ValueError, TypeError:
+        except (ValueError, TypeError):
             raise util.UnexpectedOutput(
                 _('Unexpected response from remote server:'), l)
         self.ui.status(_('%d files to transfer, %s of data\n') %
diff -r 1a726377c312 -r 47f4a47161b4 mercurial/repair.py
--- a/mercurial/repair.py	Sun Mar 30 20:25:22 2008 +0200
+++ b/mercurial/repair.py	Sun Mar 30 20:31:35 2008 +0200
@@ -72,7 +72,6 @@
 def strip(ui, repo, node, backup="all"):
     cl = repo.changelog
     # TODO delete the undo files, and handle undo of merge sets
-    pp = cl.parents(node)
     striprev = cl.rev(node)
 
     # Some revisions with rev > striprev may not be descendants of striprev.