Mercurial > public > mercurial-scm > hg-stable

diff mercurial/merge.py @ 21203:9f12d8665c7b stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ancestor: silence multiple ancestor warning outside of merge (issue4234) The current situation is a bit of a layering violation as merge-specific knowledge is pushed down to lower layers and leaks merge assumptions into other code paths. Here, we simply silence the warning with a hack. Both the warning and the hack will probably go away in the near future when bid merge is made the default.
author Matt Mackall <mpm@selenic.com>
date Wed, 30 Apr 2014 14:19:01 -0500
parents 0f0059af920c
children 6ca05c46aa95
line wrap: on
line diff
--- a/mercurial/merge.py	Fri Apr 25 13:44:51 2014 -0700
+++ b/mercurial/merge.py	Wed Apr 30 14:19:01 2014 -0500
@@ -992,7 +992,7 @@
                 cahs = repo.changelog.commonancestorsheads(p1.node(), p2.node())
                 pas = [repo[anc] for anc in (sorted(cahs) or [nullid])]
             else:
-                pas = [p1.ancestor(p2)]
+                pas = [p1.ancestor(p2, warn=True)]
 
         fp1, fp2, xp1, xp2 = p1.node(), p2.node(), str(p1), str(p2)