Patchwork D2262: py3: add couple of missing b'' in fakemergerecord.py

login
register
mail settings
Submitter phabricator
Date Feb. 14, 2018, 11:25 a.m.
Message ID <differential-rev-PHID-DREV-vhx45cppc744gmlelpzj-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/27896/
State Superseded
Headers show

Comments

phabricator - Feb. 14, 2018, 11:25 a.m.
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  1. skip-blame as we are just adding b'' prefixes

REPOSITORY
  rHG Mercurial

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

AFFECTED FILES
  tests/fakemergerecord.py

CHANGE DETAILS




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

Patch

diff --git a/tests/fakemergerecord.py b/tests/fakemergerecord.py
--- a/tests/fakemergerecord.py
+++ b/tests/fakemergerecord.py
@@ -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)