changeset 20524 | 28b8ff84db3f |
parent 20087 | cf3b8285af00 |
child 20881 | 3c47677a8d04 |
--- a/mercurial/transaction.py Sat Feb 15 22:09:32 2014 -0600 +++ b/mercurial/transaction.py Mon Feb 17 14:49:56 2014 -0600 @@ -174,7 +174,10 @@ lines = fp.readlines() fp.close() for l in lines: - f, o = l.split('\0') - entries.append((f, int(o), None)) + try: + f, o = l.split('\0') + entries.append((f, int(o), None)) + except ValueError: + report(_("couldn't read journal entry %r!\n") % l) _playback(file, report, opener, entries)