Mercurial > hg

changeset 36184:56635c506608

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: add couple of missing b'' in fakemergerecord.py # skip-blame as we are just adding b'' prefixes Differential Revision: https://phab.mercurial-scm.org/D2262
author Pulkit Goyal <7895pulkit@gmail.com>
date Wed, 14 Feb 2018 16:38:15 +0530
parents 44a519ec5077
children acc8e6e52af6
files tests/fakemergerecord.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/tests/fakemergerecord.py	Wed Feb 14 16:06:54 2018 +0530
+++ b/tests/fakemergerecord.py	Wed Feb 14 16:38:15 2018 +0530
@@ -19,8 +19,8 @@
     with repo.wlock():
         ms = merge.mergestate.read(repo)
         records = ms._makerecords()
-        if opts.get('mandatory'):
+        if opts.get(b'mandatory'):
             records.append((b'X', b'mandatory record'))
-        if opts.get('advisory'):
+        if opts.get(b'advisory'):
             records.append((b'x', b'advisory record'))
         ms._writerecords(records)