[PATCH 3 of 3] merge: mute the status message when bid merge kicks in

[Mads Kiilerich]

# HG changeset patch
# User Mads Kiilerich <madski at unity3d.com>
# Date 1412127720 -7200
#      Wed Oct 01 03:42:00 2014 +0200
# Node ID 1fae09071a02c2df15dbfa180c6b5ae11b66fc1b
# Parent  f9401645aaad1847fe5b3d0ebf49f2c0b76127a1
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.)

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -780,7 +780,7 @@ def calculateupdates(repo, wctx, mctx, a
                                 partial, acceptremote, followcopies)
 
     else: # only when merge.preferancestor=* - the default
-        repo.ui.status(
+        repo.ui.note(
             _("note: merging %s and %s using bids from ancestors %s\n") %
             (wctx, mctx, _(' and ').join(str(anc) for anc in ancestors)))
 
diff --git a/tests/test-merge-criss-cross.t b/tests/test-merge-criss-cross.t
--- a/tests/test-merge-criss-cross.t
+++ b/tests/test-merge-criss-cross.t
@@ -210,7 +210,6 @@ Verify how the output looks and and how 
 
   $ hg up -qC
   $ hg merge
-  note: merging 3b08d01b0ab5+ and adfe50279922 using bids from ancestors 0f6b37dbe527 and 40663881a6dd
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)