Mercurial > public > mercurial-scm > hg-stable

diff mercurial/context.py @ 22180:17011b36aac7 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
changectx: ancestor should only prefer merge.preferancestor if it is a revision The value '*' currently designates that bid merge should be used. The best way to test bid merge is to set preferancestor=* in the configuration file ... but then it would abort with unknown revision '*' when other code paths ended up in changectx.ancestor . Instead, just skip and ignore the value '*' when looking for a preferred ancestor.
author Mads Kiilerich <madski@unity3d.com>
date Fri, 15 Aug 2014 02:46:44 +0200
parents 48e32c2c499b
children 8dda6f6ff564
line wrap: on
line diff
--- a/mercurial/context.py	Fri Aug 15 02:39:01 2014 +0200
+++ b/mercurial/context.py	Fri Aug 15 02:46:44 2014 +0200
@@ -553,6 +553,8 @@
             anc = cahs[0]
         else:
             for r in self._repo.ui.configlist('merge', 'preferancestor'):
+                if r == '*':
+                    continue
                 ctx = changectx(self._repo, r)
                 anc = ctx.node()
                 if anc in cahs: