Patchwork D3082: context: use revsymbol() in "merge.preferancestor" code

login
register
mail settings
Submitter phabricator
Date April 5, 2018, 12:50 a.m.
Message ID <a36b959ffad29be752991f42502dbc8d@localhost.localdomain>
Download mbox | patch
Permalink /patch/30312/
State Not Applicable
Headers show

Comments

phabricator - April 5, 2018, 12:50 a.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGa6014392837e: context: use revsymbol() in &quot;merge.preferancestor&quot; code (authored by martinvonz, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D3082?vs=7656&id=7668

REVISION DETAIL
  https://phab.mercurial-scm.org/D3082

AFFECTED FILES
  mercurial/context.py

CHANGE DETAILS




To: martinvonz, #hg-reviewers, indygreg
Cc: mercurial-devel

Patch

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