Show More
@@ -347,6 +347,7 b' test-revlog-mmapindex.t' | |||||
347 | test-revlog-packentry.t |
|
347 | test-revlog-packentry.t | |
348 | test-revset-dirstate-parents.t |
|
348 | test-revset-dirstate-parents.t | |
349 | test-revset-outgoing.t |
|
349 | test-revset-outgoing.t | |
|
350 | test-rollback.t | |||
350 | test-run-tests.py |
|
351 | test-run-tests.py | |
351 | test-schemes.t |
|
352 | test-schemes.t | |
352 | test-serve.t |
|
353 | test-serve.t |
@@ -18,6 +18,7 b' import errno' | |||||
18 | from .i18n import _ |
|
18 | from .i18n import _ | |
19 | from . import ( |
|
19 | from . import ( | |
20 | error, |
|
20 | error, | |
|
21 | pycompat, | |||
21 | util, |
|
22 | util, | |
22 | ) |
|
23 | ) | |
23 |
|
24 | |||
@@ -604,7 +605,8 b' def rollback(opener, vfsmap, file, repor' | |||||
604 | f, o = l.split('\0') |
|
605 | f, o = l.split('\0') | |
605 | entries.append((f, int(o), None)) |
|
606 | entries.append((f, int(o), None)) | |
606 | except ValueError: |
|
607 | except ValueError: | |
607 | report(_("couldn't read journal entry %r!\n") % l) |
|
608 | report( | |
|
609 | _("couldn't read journal entry %r!\n") % pycompat.bytestr(l)) | |||
608 |
|
610 | |||
609 | backupjournal = "%s.backupfiles" % file |
|
611 | backupjournal = "%s.backupfiles" % file | |
610 | if opener.exists(backupjournal): |
|
612 | if opener.exists(backupjournal): |
General Comments 0
You need to be logged in to leave comments.
Login now