D3082: context: use revsymbol() in "merge.preferancestor" code
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Wed Apr 4 20:50:58 EDT 2018
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGa6014392837e: context: use revsymbol() in "merge.preferancestor" 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
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()
To: martinvonz, #hg-reviewers, indygreg
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list