durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches.
REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D8564 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 @@ -4,10 +4,7 @@ from __future__ import absolute_import -from mercurial import ( - mergestate as mergestatemod, - registrar, -) +from mercurial import registrar cmdtable = {} command = registrar.command(cmdtable) @@ -23,7 +20,7 @@ ) def fakemergerecord(ui, repo, *pats, **opts): with repo.wlock(): - ms = mergestatemod.mergestate.read(repo) + ms = repo[None].mergestate() records = ms._makerecords() if opts.get('mandatory'): records.append((b'X', b'mandatory record')) To: durin42, #hg-reviewers Cc: mercurial-patches, mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
