Mercurial > public > mercurial-scm > hg-stable

diff mercurial/context.py @ 22671:5220c12c43fd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
changectx: skip all invalid merge.preferancestor values A better fix for 17011b36aac7 that will ignore other kinds of "invalid" revisions.
author Mads Kiilerich <madski@unity3d.com>
date Wed, 01 Oct 2014 03:40:51 +0200
parents 6f63c47cbb86
children 509e2cbee679
line wrap: on
line diff
--- a/mercurial/context.py	Wed Apr 30 16:56:23 2014 -0700
+++ b/mercurial/context.py	Wed Oct 01 03:40:51 2014 +0200
@@ -558,9 +558,10 @@
             anc = cahs[0]
         else:
             for r in self._repo.ui.configlist('merge', 'preferancestor'):
-                if r == '*':
+                try:
+                    ctx = changectx(self._repo, r)
+                except error.RepoLookupError:
                     continue
-                ctx = changectx(self._repo, r)
                 anc = ctx.node()
                 if anc in cahs:
                     break