Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/merge.py @ 22673:16a46003b50c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: mute the status message when bid merge kicks in Bid merge is now the default and it is not necessary to tell the user that an experimental feature kicked in. (It could however still be relevant to get a notice that it is one of the rare criss-cross merge situations so the user is warned that the situation is more tricky than usual.)
author Mads Kiilerich <madski@unity3d.com>
date Wed, 01 Oct 2014 03:42:00 +0200
parents 19903277f035
children 7a06ad9518c0
comparison
equal deleted inserted replaced
22672:19903277f035 22673:16a46003b50c
778 actions = manifestmerge(repo, wctx, mctx, ancestors[0], 778 actions = manifestmerge(repo, wctx, mctx, ancestors[0],
779 branchmerge, force, 779 branchmerge, force,
780 partial, acceptremote, followcopies) 780 partial, acceptremote, followcopies)
781 781
782 else: # only when merge.preferancestor=* - the default 782 else: # only when merge.preferancestor=* - the default
783 repo.ui.status( 783 repo.ui.note(
784 _("note: merging %s and %s using bids from ancestors %s\n") % 784 _("note: merging %s and %s using bids from ancestors %s\n") %
785 (wctx, mctx, _(' and ').join(str(anc) for anc in ancestors))) 785 (wctx, mctx, _(' and ').join(str(anc) for anc in ancestors)))
786 786
787 # Call for bids 787 # Call for bids
788 fbids = {} # mapping filename to bids (action method to list af actions) 788 fbids = {} # mapping filename to bids (action method to list af actions)