Comments
Patch
@@ -1151,7 +1151,10 @@ def calculateupdates(
# 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()):
repo.ui.note(_(b" %s:\n list of bids:\n") % f)
@@ -149,7 +149,7 @@ Redo merge with merge.preferancestor="*"
f1: versions differ -> m
f2: remote unchanged -> k
- auction for merging merge bids
+ auction for merging merge bids (2 ancestors)
f1:
list of bids:
remote is newer -> g
@@ -200,7 +200,7 @@ The other way around:
f1: versions differ -> m
f2: remote is newer -> g
- auction for merging merge bids
+ auction for merging merge bids (2 ancestors)
f1:
list of bids:
remote unchanged -> k
@@ -246,7 +246,7 @@ Verify how the output looks and and how
calculating bids for ancestor 40663881a6dd
resolving manifests
- auction for merging merge bids
+ auction for merging merge bids (2 ancestors)
f1:
list of bids:
remote is newer -> g
@@ -281,7 +281,7 @@ Verify how the output looks and and how
f1: versions differ -> m
f2: remote unchanged -> k
- auction for merging merge bids
+ auction for merging merge bids (2 ancestors)
f1:
list of bids:
remote is newer -> g
@@ -375,7 +375,7 @@ http://stackoverflow.com/questions/93500
calculating bids for ancestor b211bbc6eb3c
resolving manifests
- auction for merging merge bids
+ auction for merging merge bids (2 ancestors)
x:
list of bids:
versions differ -> m
@@ -463,7 +463,7 @@ Verify that the old context ancestor wor
d1/b: other deleted -> r
d2/b: remote created -> g
- auction for merging merge bids
+ auction for merging merge bids (2 ancestors)
d1/a:
list of bids:
other deleted -> r