Mercurial > hg

changeset 7064:582dac23ebac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew-stable
author Patrick Mezard <pmezard@gmail.com>
date Mon, 06 Oct 2008 13:51:36 +0200
parents efc579fdaf69 (current diff) be2daa324ddf (diff)
children 9bc46d069a76
files mercurial/localrepo.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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)))