Patchwork D1891: transaction: fix hg version check when loading journal

login
register
mail settings
Submitter phabricator
Date Feb. 1, 2018, 8:39 p.m.
Message ID <15f8a0dea20afb07be80bf93ea1aec74@localhost.localdomain>
Download mbox | patch
Permalink /patch/27130/
State Not Applicable
Headers show

Comments

phabricator - Feb. 1, 2018, 8:39 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGa07f727a7eb1: transaction: fix hg version check when loading journal (authored by durin42, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D1891?vs=4907&id=5061

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

AFFECTED FILES
  mercurial/transaction.py

CHANGE DETAILS




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

Patch

diff --git a/mercurial/transaction.py b/mercurial/transaction.py
--- a/mercurial/transaction.py
+++ b/mercurial/transaction.py
@@ -612,7 +612,7 @@ 
         lines = fp.readlines()
         if lines:
             ver = lines[0][:-1]
-            if ver == str(version):
+            if ver == (b'%d' % version):
                 for line in lines[1:]:
                     if line:
                         # Shave off the trailing newline