Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 34479:99c3dee3f6ce

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
configitems: register the 'merge.preferancestor' config
author Boris Feld <boris.feld@octobus.net>
date Fri, 30 Jun 2017 03:43:13 +0200
parents 6f49ea88d984
children a57c938e7ac8
comparison
equal deleted inserted replaced
34478:ef303daefdf7 34479:99c3dee3f6ce
1564 1564
1565 overwrite = force and not branchmerge 1565 overwrite = force and not branchmerge
1566 1566
1567 p2 = repo[node] 1567 p2 = repo[node]
1568 if pas[0] is None: 1568 if pas[0] is None:
1569 if repo.ui.configlist('merge', 'preferancestor', ['*']) == ['*']: 1569 if repo.ui.configlist('merge', 'preferancestor') == ['*']:
1570 cahs = repo.changelog.commonancestorsheads(p1.node(), p2.node()) 1570 cahs = repo.changelog.commonancestorsheads(p1.node(), p2.node())
1571 pas = [repo[anc] for anc in (sorted(cahs) or [nullid])] 1571 pas = [repo[anc] for anc in (sorted(cahs) or [nullid])]
1572 else: 1572 else:
1573 pas = [p1.ancestor(p2, warn=branchmerge)] 1573 pas = [p1.ancestor(p2, warn=branchmerge)]
1574 1574