Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew-stable
authorPatrick Mezard <pmezard@gmail.com>
Mon, 06 Oct 2008 13:51:36 +0200
changeset 7064 582dac23ebac
parent 7062 efc579fdaf69 (current diff)
parent 7063 be2daa324ddf (diff)
child 7065 9bc46d069a76
Merge with crew-stable
mercurial/localrepo.py file | annotate | diff | comparison | revisions 
--- a/mercurial/localrepo.py	Sat Oct 04 10:14:39 2008 +0200
+++ b/mercurial/localrepo.py	Mon Oct 06 13:51:36 2008 +0200
@@ -2019,7 +2019,7 @@
             try:
                 name, size = l.split('\0', 1)
                 size = int(size)
-            except ValueError, TypeError:
+            except (ValueError, TypeError):
                 raise util.UnexpectedOutput(
                     _('Unexpected response from remote server:'), l)
             self.ui.debug(_('adding %s (%s)\n') % (name, util.bytecount(size)))
Mercurial