This revision was automatically updated to reflect the committed changes. Closed by commit rHG45e443342934: py3: backout changeset 56635c506608 which wrongly added couple of b'' (authored by pulkit, committed by ).
REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2504?vs=6204&id=6236 REVISION DETAIL https://phab.mercurial-scm.org/D2504 AFFECTED FILES tests/fakemergerecord.py CHANGE DETAILS 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) To: pulkit, #hg-reviewers Cc: mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
