Mercurial > public > mercurial-scm > hg

comparison mercurial/context.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 4d1382fd96ff
children 3a0bb61371c5
comparison
equal deleted inserted replaced
25843:bf9ea348b487 25844:18541e9510c5
574 if not cahs: 574 if not cahs:
575 anc = nullid 575 anc = nullid
576 elif len(cahs) == 1: 576 elif len(cahs) == 1:
577 anc = cahs[0] 577 anc = cahs[0]
578 else: 578 else:
579 for r in self._repo.ui.configlist('merge', 'preferancestor'): 579 # experimental config: merge.preferancestor
580 for r in self._repo.ui.configlist('merge', 'preferancestor', ['*']):
580 try: 581 try:
581 ctx = changectx(self._repo, r) 582 ctx = changectx(self._repo, r)
582 except error.RepoLookupError: 583 except error.RepoLookupError:
583 continue 584 continue
584 anc = ctx.node() 585 anc = ctx.node()