##// END OF EJS Templates
merge: show list of bids for each file in bid-merge in ui.debug()...
Pulkit Goyal -
r46031:ccd3bf44 default
parent child Browse files
Show More
@@ -1157,6 +1157,11 b' def calculateupdates('
1157 )
1157 )
1158 mresult = mergeresult()
1158 mresult = mergeresult()
1159 for f, bids in sorted(fbids.items()):
1159 for f, bids in sorted(fbids.items()):
1160 if repo.ui.debugflag:
1161 repo.ui.debug(b" list of bids for %s:\n" % f)
1162 for m, l in sorted(bids.items()):
1163 for _f, args, msg in l:
1164 repo.ui.debug(b' %s -> %s\n' % (msg, m))
1160 # bids is a mapping from action method to list af actions
1165 # bids is a mapping from action method to list af actions
1161 # Consensus?
1166 # Consensus?
1162 if len(bids) == 1: # all bids are the same kind of method
1167 if len(bids) == 1: # all bids are the same kind of method
@@ -150,7 +150,13 b' Redo merge with merge.preferancestor="*"'
150 f2: remote unchanged -> k
150 f2: remote unchanged -> k
151
151
152 auction for merging merge bids (2 ancestors)
152 auction for merging merge bids (2 ancestors)
153 list of bids for f1:
154 remote is newer -> g
155 versions differ -> m
153 f1: picking 'get' action
156 f1: picking 'get' action
157 list of bids for f2:
158 remote unchanged -> k
159 versions differ -> m
154 f2: picking 'keep' action
160 f2: picking 'keep' action
155 end of auction
161 end of auction
156
162
@@ -193,7 +199,13 b' The other way around:'
193 f2: remote is newer -> g
199 f2: remote is newer -> g
194
200
195 auction for merging merge bids (2 ancestors)
201 auction for merging merge bids (2 ancestors)
202 list of bids for f1:
203 remote unchanged -> k
204 versions differ -> m
196 f1: picking 'keep' action
205 f1: picking 'keep' action
206 list of bids for f2:
207 remote is newer -> g
208 versions differ -> m
197 f2: picking 'get' action
209 f2: picking 'get' action
198 end of auction
210 end of auction
199
211
@@ -258,7 +270,13 b' Verify how the output looks and and how '
258 f2: remote unchanged -> k
270 f2: remote unchanged -> k
259
271
260 auction for merging merge bids (2 ancestors)
272 auction for merging merge bids (2 ancestors)
273 list of bids for f1:
274 remote is newer -> g
275 versions differ -> m
261 f1: picking 'get' action
276 f1: picking 'get' action
277 list of bids for f2:
278 remote unchanged -> k
279 versions differ -> m
262 f2: picking 'keep' action
280 f2: picking 'keep' action
263 end of auction
281 end of auction
264
282
@@ -431,8 +449,15 b' Verify that the old context ancestor wor'
431 d2/b: remote created -> g
449 d2/b: remote created -> g
432
450
433 auction for merging merge bids (2 ancestors)
451 auction for merging merge bids (2 ancestors)
452 list of bids for d1/a:
453 other deleted -> r
434 d1/a: consensus for r
454 d1/a: consensus for r
455 list of bids for d1/b:
456 other deleted -> r
435 d1/b: consensus for r
457 d1/b: consensus for r
458 list of bids for d2/b:
459 remote created -> g
460 remote created -> g
436 d2/b: consensus for g
461 d2/b: consensus for g
437 end of auction
462 end of auction
438
463
General Comments 0
You need to be logged in to leave comments. Login now