Mercurial > public > mercurial-scm > hg

diff mercurial/merge.py @ 21171:33737ebc6f39 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: tell the user when we are using bid merge Bid merge is a new rarely used feature that the user explicitly enabled - we should tell/warn when the user actually is using it, just like we tell when we not are using it. Give a message like note: merging 3b08d01b0ab5+ and adfe50279922 using bids from ancestors 0f6b37dbe527 and 40663881a6dd
author Mads Kiilerich <madski@unity3d.com>
date Fri, 18 Apr 2014 13:33:20 +0200
parents ea3972243320
children 0f0059af920c
line wrap: on
line diff
--- a/mercurial/merge.py	Mon Apr 21 20:22:14 2014 +0200
+++ b/mercurial/merge.py	Fri Apr 18 13:33:20 2014 +0200
@@ -730,6 +730,10 @@
                                 partial, acceptremote, followcopies)
 
     else: # only when merge.preferancestor=* - experimentalish code
+        repo.ui.status(
+            _("note: merging %s and %s using bids from ancestors %s\n") %
+            (wctx, mctx, _(' and ').join(str(anc) for anc in ancestors)))
+
         # Call for bids
         fbids = {} # mapping filename to list af action bids
         for ancestor in ancestors: