Mercurial > public > mercurial-scm > hg
comparison mercurial/merge.py @ 45447:e7c8a5030a90
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 |
comparison
equal
deleted
inserted
replaced
| 45446:00e4e97c6bc8 | 45447:e7c8a5030a90 |
|---|---|
| 1149 else: | 1149 else: |
| 1150 fbids[f] = {m: [a]} | 1150 fbids[f] = {m: [a]} |
| 1151 | 1151 |
| 1152 # Call for bids | 1152 # Call for bids |
| 1153 # Pick the best bid for each file | 1153 # Pick the best bid for each file |
| 1154 repo.ui.note(_(b'\nauction for merging merge bids\n')) | 1154 repo.ui.note( |
| 1155 _(b'\nauction for merging merge bids (%d ancestors)\n') | |
| 1156 % len(ancestors) | |
| 1157 ) | |
| 1155 mresult = mergeresult() | 1158 mresult = mergeresult() |
| 1156 for f, bids in sorted(fbids.items()): | 1159 for f, bids in sorted(fbids.items()): |
| 1157 # bids is a mapping from action method to list af actions | 1160 # bids is a mapping from action method to list af actions |
| 1158 # Consensus? | 1161 # Consensus? |
| 1159 if len(bids) == 1: # all bids are the same kind of method | 1162 if len(bids) == 1: # all bids are the same kind of method |