Mercurial > public > mercurial-scm > hg

comparison 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
comparison
equal deleted inserted replaced
22178:70383c6961b4 22179:46308fadaa15
1050 if pas[0] is None: 1050 if pas[0] is None:
1051 if repo.ui.config("merge", "preferancestor") == '*': 1051 if repo.ui.config("merge", "preferancestor") == '*':
1052 cahs = repo.changelog.commonancestorsheads(p1.node(), p2.node()) 1052 cahs = repo.changelog.commonancestorsheads(p1.node(), p2.node())
1053 pas = [repo[anc] for anc in (sorted(cahs) or [nullid])] 1053 pas = [repo[anc] for anc in (sorted(cahs) or [nullid])]
1054 else: 1054 else:
1055 pas = [p1.ancestor(p2, warn=True)] 1055 pas = [p1.ancestor(p2, warn=branchmerge)]
1056 1056
1057 fp1, fp2, xp1, xp2 = p1.node(), p2.node(), str(p1), str(p2) 1057 fp1, fp2, xp1, xp2 = p1.node(), p2.node(), str(p1), str(p2)
1058 1058
1059 ### check phase 1059 ### check phase
1060 if not overwrite and len(pl) > 1: 1060 if not overwrite and len(pl) > 1: