Patchwork D2504: py3: backout changeset 56635c506608 which wrongly added couple of b''

login
register
mail settings
Submitter phabricator
Date Feb. 28, 2018, 10:29 p.m.
Message ID <differential-rev-PHID-DREV-ihcw22bvxrlxwqtppkpf-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/28502/
State Superseded
Headers show

Comments

phabricator - Feb. 28, 2018, 10:29 p.m.
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  I am not sure what I was thinking when I added that but while fixing rebase
  tests, I revisited the file and found that I did wrong. I am sorry for this.

REPOSITORY
  rHG Mercurial

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

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(b'mandatory'):
+        if opts.get('mandatory'):
             records.append((b'X', b'mandatory record'))
-        if opts.get(b'advisory'):
+        if opts.get('advisory'):
             records.append((b'x', b'advisory record'))
         ms._writerecords(records)