equal
deleted
inserted
replaced
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 |