Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
context: use revsymbol() in "merge.preferancestor" code
authorMartin von Zweigbergk <martinvonz@google.com>
Tue, 03 Apr 2018 23:47:01 -0700
changeset 37354 a6014392837e
parent 37353 ac666c5c2e0c
child 37355 5bcd5859b505
context: use revsymbol() in "merge.preferancestor" code Differential Revision: https://phab.mercurial-scm.org/D3082
mercurial/context.py file | annotate | diff | comparison | revisions 
--- a/mercurial/context.py	Wed Apr 04 15:11:43 2018 -0700
+++ b/mercurial/context.py	Tue Apr 03 23:47:01 2018 -0700
@@ -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()
Mercurial