Mercurial > public > mercurial-scm > hg-stable

diff mercurial/merge.py @ 45458:e7c8a5030a90

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: show number of ancestors in bid merge debug notes A good number of times, we don't generate an action for a file in manifestmerge() which can result in bid merge doing the wrong thing. Mentioning the number of ancestors from which we are bidding will help spot such cases where we are not returning an action. Differential Revision: https://phab.mercurial-scm.org/D8967
author Pulkit Goyal <7895pulkit@gmail.com>
date Wed, 26 Aug 2020 17:24:22 +0530
parents 05d19ca33b33
children ccd3bf4490c1
line wrap: on
line diff
--- a/mercurial/merge.py	Thu Sep 03 14:45:16 2020 +0530
+++ b/mercurial/merge.py	Wed Aug 26 17:24:22 2020 +0530
@@ -1151,7 +1151,10 @@
 
         # Call for bids
         # Pick the best bid for each file
-        repo.ui.note(_(b'\nauction for merging merge bids\n'))
+        repo.ui.note(
+            _(b'\nauction for merging merge bids (%d ancestors)\n')
+            % len(ancestors)
+        )
         mresult = mergeresult()
         for f, bids in sorted(fbids.items()):
             # bids is a mapping from action method to list af actions