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
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)