Mercurial > hg-stable
changeset 37354:a6014392837e
context: use revsymbol() in "merge.preferancestor" code
Differential Revision: https://phab.mercurial-scm.org/D3082
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Tue, 03 Apr 2018 23:47:01 -0700 |
| parents | ac666c5c2e0c |
| children | 5bcd5859b505 |
| files | mercurial/context.py |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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()