Mercurial > public > mercurial-scm > hg-stable

diff mercurial/merge.py @ 22179:46308fadaa15 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: show the scary multiple ancestor hint for merges only, not for updates Updates with uncommited changes will always only have one ancestor - the parent revision. Updates between existing revision should (and will) always give the same result no matter which ancestor is used. The warning is thus only relevant when doing a "real" merge.
author Mads Kiilerich <madski@unity3d.com>
date Fri, 15 Aug 2014 02:39:01 +0200
parents bde505f47141
children 8dda6f6ff564
line wrap: on
line diff
--- a/mercurial/merge.py	Thu Aug 14 16:26:41 2014 -0700
+++ b/mercurial/merge.py	Fri Aug 15 02:39:01 2014 +0200
@@ -1052,7 +1052,7 @@
                 cahs = repo.changelog.commonancestorsheads(p1.node(), p2.node())
                 pas = [repo[anc] for anc in (sorted(cahs) or [nullid])]
             else:
-                pas = [p1.ancestor(p2, warn=True)]
+                pas = [p1.ancestor(p2, warn=branchmerge)]
 
         fp1, fp2, xp1, xp2 = p1.node(), p2.node(), str(p1), str(p2)