martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers.
REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3082 AFFECTED FILES mercurial/context.py CHANGE DETAILS diff --git a/mercurial/context.py b/mercurial/context.py --- a/mercurial/context.py +++ b/mercurial/context.py @@ -631,7 +631,7 @@ # experimental config: merge.preferancestor for r in self._repo.ui.configlist('merge', 'preferancestor'): try: - ctx = changectx(self._repo, r) + ctx = scmutil.revsymbol(self._repo, r) except error.RepoLookupError: continue anc = ctx.node() To: martinvonz, #hg-reviewers Cc: mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
