Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 25844:18541e9510c5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: make merge.preferancestor type and default consistent (and mark it)
author Matt Mackall <mpm@selenic.com>
date Thu, 25 Jun 2015 17:54:55 -0500
parents bf9ea348b487
children 892d601f0d44
comparison
equal deleted inserted replaced
25843:bf9ea348b487 25844:18541e9510c5
1009 1009
1010 overwrite = force and not branchmerge 1010 overwrite = force and not branchmerge
1011 1011
1012 p2 = repo[node] 1012 p2 = repo[node]
1013 if pas[0] is None: 1013 if pas[0] is None:
1014 if repo.ui.config('merge', 'preferancestor', '*') == '*': 1014 if repo.ui.configlist('merge', 'preferancestor', ['*']) == ['*']:
1015 cahs = repo.changelog.commonancestorsheads(p1.node(), p2.node()) 1015 cahs = repo.changelog.commonancestorsheads(p1.node(), p2.node())
1016 pas = [repo[anc] for anc in (sorted(cahs) or [nullid])] 1016 pas = [repo[anc] for anc in (sorted(cahs) or [nullid])]
1017 else: 1017 else:
1018 pas = [p1.ancestor(p2, warn=branchmerge)] 1018 pas = [p1.ancestor(p2, warn=branchmerge)]
1019 1019