Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 34349:6f49ea88d984

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: use pycompat.bytestr instead of str Differential Revision: https://phab.mercurial-scm.org/D855
author Pulkit Goyal <7895pulkit@gmail.com>
date Sat, 30 Sep 2017 15:48:08 +0530
parents 1a5abc45e2fa
children 99c3dee3f6ce
comparison
equal deleted inserted replaced
34348:1a5abc45e2fa 34349:6f49ea88d984
988 _checkunknownfiles(repo, wctx, mctx, force, actions, mergeforce) 988 _checkunknownfiles(repo, wctx, mctx, force, actions, mergeforce)
989 989
990 else: # only when merge.preferancestor=* - the default 990 else: # only when merge.preferancestor=* - the default
991 repo.ui.note( 991 repo.ui.note(
992 _("note: merging %s and %s using bids from ancestors %s\n") % 992 _("note: merging %s and %s using bids from ancestors %s\n") %
993 (wctx, mctx, _(' and ').join(str(anc) for anc in ancestors))) 993 (wctx, mctx, _(' and ').join(pycompat.bytestr(anc)
994 for anc in ancestors)))
994 995
995 # Call for bids 996 # Call for bids
996 fbids = {} # mapping filename to bids (action method to list af actions) 997 fbids = {} # mapping filename to bids (action method to list af actions)
997 diverge, renamedelete = None, None 998 diverge, renamedelete = None, None
998 for ancestor in ancestors: 999 for ancestor in ancestors: