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

2018-02-14 Thread pulkit (Pulkit Goyal) 
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG56635c506608: py3: add couple of missing b in 
fakemergerecord.py (authored by pulkit, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D2262?vs=5702=5716

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

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



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

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

2018-02-14 Thread pulkit (Pulkit Goyal) 
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

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)



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