Show More
@@ -1151,7 +1151,10 b' def calculateupdates(' | |||||
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 |
@@ -149,7 +149,7 b' Redo merge with merge.preferancestor="*"' | |||||
149 | f1: versions differ -> m |
|
149 | f1: versions differ -> m | |
150 | f2: remote unchanged -> k |
|
150 | f2: remote unchanged -> k | |
151 |
|
151 | |||
152 | auction for merging merge bids |
|
152 | auction for merging merge bids (2 ancestors) | |
153 | f1: picking 'get' action |
|
153 | f1: picking 'get' action | |
154 | f2: picking 'keep' action |
|
154 | f2: picking 'keep' action | |
155 | end of auction |
|
155 | end of auction | |
@@ -192,7 +192,7 b' The other way around:' | |||||
192 | f1: versions differ -> m |
|
192 | f1: versions differ -> m | |
193 | f2: remote is newer -> g |
|
193 | f2: remote is newer -> g | |
194 |
|
194 | |||
195 | auction for merging merge bids |
|
195 | auction for merging merge bids (2 ancestors) | |
196 | f1: picking 'keep' action |
|
196 | f1: picking 'keep' action | |
197 | f2: picking 'get' action |
|
197 | f2: picking 'get' action | |
198 | end of auction |
|
198 | end of auction | |
@@ -230,7 +230,7 b' Verify how the output looks and and how ' | |||||
230 | calculating bids for ancestor 40663881a6dd |
|
230 | calculating bids for ancestor 40663881a6dd | |
231 | resolving manifests |
|
231 | resolving manifests | |
232 |
|
232 | |||
233 | auction for merging merge bids |
|
233 | auction for merging merge bids (2 ancestors) | |
234 | f1: picking 'get' action |
|
234 | f1: picking 'get' action | |
235 | f2: picking 'keep' action |
|
235 | f2: picking 'keep' action | |
236 | end of auction |
|
236 | end of auction | |
@@ -257,7 +257,7 b' Verify how the output looks and and how ' | |||||
257 | f1: versions differ -> m |
|
257 | f1: versions differ -> m | |
258 | f2: remote unchanged -> k |
|
258 | f2: remote unchanged -> k | |
259 |
|
259 | |||
260 | auction for merging merge bids |
|
260 | auction for merging merge bids (2 ancestors) | |
261 | f1: picking 'get' action |
|
261 | f1: picking 'get' action | |
262 | f2: picking 'keep' action |
|
262 | f2: picking 'keep' action | |
263 | end of auction |
|
263 | end of auction | |
@@ -343,7 +343,7 b' http://stackoverflow.com/questions/93500' | |||||
343 | calculating bids for ancestor b211bbc6eb3c |
|
343 | calculating bids for ancestor b211bbc6eb3c | |
344 | resolving manifests |
|
344 | resolving manifests | |
345 |
|
345 | |||
346 | auction for merging merge bids |
|
346 | auction for merging merge bids (2 ancestors) | |
347 | x: multiple bids for merge action: |
|
347 | x: multiple bids for merge action: | |
348 | versions differ -> m |
|
348 | versions differ -> m | |
349 | versions differ -> m |
|
349 | versions differ -> m | |
@@ -430,7 +430,7 b' Verify that the old context ancestor wor' | |||||
430 | d1/b: other deleted -> r |
|
430 | d1/b: other deleted -> r | |
431 | d2/b: remote created -> g |
|
431 | d2/b: remote created -> g | |
432 |
|
432 | |||
433 | auction for merging merge bids |
|
433 | auction for merging merge bids (2 ancestors) | |
434 | d1/a: consensus for r |
|
434 | d1/a: consensus for r | |
435 | d1/b: consensus for r |
|
435 | d1/b: consensus for r | |
436 | d2/b: consensus for g |
|
436 | d2/b: consensus for g |
General Comments 0
You need to be logged in to leave comments.
Login now