##// END OF EJS Templates
bidmerge: choose shortest list of diverge and rename/delete warnings...
Matt Mackall -
r26318:d3bd6cef default
parent child Browse files
Show More
@@ -596,10 +596,14 b' def calculateupdates(repo, wctx, mctx, a'
596 596 repo, wctx, mctx, ancestor, branchmerge, force, partial,
597 597 acceptremote, followcopies)
598 598 _checkunknownfiles(repo, wctx, mctx, force, actions)
599 if diverge is None: # and renamedelete is None.
600 # Arbitrarily pick warnings from first iteration
599
600 # Track the shortest set of warning on the theory that bid
601 # merge will correctly incorporate more information
602 if diverge is None or len(diverge1) < len(diverge):
601 603 diverge = diverge1
604 if renamedelete is None or len(renamedelete) < len(renamedelete1):
602 605 renamedelete = renamedelete1
606
603 607 for f, a in sorted(actions.iteritems()):
604 608 m, args, msg = a
605 609 repo.ui.debug(' %s: %s -> %s\n' % (f, msg, m))
General Comments 0
You need to be logged in to leave comments. Login now