D1891: transaction: fix hg version check when loading journal

durin42 (Augie Fackler) phabricator at mercurial-scm.org
Thu Jan 18 13:38:47 UTC 2018


durin42 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D1891

AFFECTED FILES
  mercurial/transaction.py

CHANGE DETAILS

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,
 )
 
@@ -612,7 +613,7 @@
         lines = fp.readlines()
         if lines:
             ver = lines[0][:-1]
-            if ver == str(version):
+            if ver == pycompat.bytestr(version):
                 for line in lines[1:]:
                     if line:
                         # Shave off the trailing newline



To: durin42, #hg-reviewers
Cc: mercurial-devel


More information about the Mercurial-devel mailing list