# HG changeset patch # User Martin von Zweigbergk # Date 2018-04-04 06:47:01 # Node ID a6014392837e5d474cb3b229a9a629627f4c631d # Parent ac666c5c2e0ceb2c1262540ed85cd2822a632459 context: use revsymbol() in "merge.preferancestor" code Differential Revision: https://phab.mercurial-scm.org/D3082 diff --git a/mercurial/context.py b/mercurial/context.py --- a/mercurial/context.py +++ b/mercurial/context.py @@ -631,7 +631,7 @@ class changectx(basectx): # 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()