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