diff --git a/contrib/python3-whitelist b/contrib/python3-whitelist --- a/contrib/python3-whitelist +++ b/contrib/python3-whitelist @@ -347,6 +347,7 @@ test-revlog-packentry.t test-revset-dirstate-parents.t test-revset-outgoing.t +test-rollback.t test-run-tests.py test-schemes.t test-serve.t diff --git a/mercurial/transaction.py b/mercurial/transaction.py --- a/mercurial/transaction.py +++ b/mercurial/transaction.py @@ -18,6 +18,7 @@ from .i18n import _ from . import ( error, + pycompat, util, ) @@ -604,7 +605,8 @@ f, o = l.split('\0') entries.append((f, int(o), None)) except ValueError: - report(_("couldn't read journal entry %r!\n") % l) + report( + _("couldn't read journal entry %r!\n") % pycompat.bytestr(l)) backupjournal = "%s.backupfiles" % file if opener.exists(backupjournal):