# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 2015-08-19 19:05:42
# Node ID d3bd6cefd74206b5a3b004fff2f6ff456288d533
# Parent  07ac78ba2e379baefc83148096f2ddf34bb2b7c8

bidmerge: choose shortest list of diverge and rename/delete warnings

Slightly less arbitrary than choosing the first set.

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -596,10 +596,14 @@ def calculateupdates(repo, wctx, mctx, a
                 repo, wctx, mctx, ancestor, branchmerge, force, partial,
                 acceptremote, followcopies)
             _checkunknownfiles(repo, wctx, mctx, force, actions)
-            if diverge is None: # and renamedelete is None.
-                # Arbitrarily pick warnings from first iteration
+
+            # Track the shortest set of warning on the theory that bid
+            # merge will correctly incorporate more information
+            if diverge is None or len(diverge1) < len(diverge):
                 diverge = diverge1
+            if renamedelete is None or len(renamedelete) < len(renamedelete1):
                 renamedelete = renamedelete1
+
             for f, a in sorted(actions.iteritems()):
                 m, args, msg = a
                 repo.ui.debug(' %s: %s -> %s\n' % (f, msg, m))