py3: backout changeset
56635c506608 which wrongly added couple of b''
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.
Differential Revision: https://phab.mercurial-scm.org/D2504
--- a/tests/fakemergerecord.py Wed Feb 28 21:45:42 2018 +0530
+++ b/tests/fakemergerecord.py Wed Feb 28 21:48:30 2018 +0530
@@ -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)