merge: check for conflicting actions irrespective of length of bids
We should for whether bids contain a combination of actions which conflict with
each other. Since right now we only have couple of such combination, and
combinations also consist of two actions, we were checking for them only when
length of bids is 2. Let's check that irrespective of the length of bids.
--- a/mercurial/merge.py Fri Oct 02 07:56:01 2020 -0700
+++ b/mercurial/merge.py Fri Oct 02 18:40:39 2020 +0530
@@ -1223,7 +1223,6 @@
if (
mergestatemod.ACTION_CHANGED_DELETED in bids
and mergestatemod.ACTION_KEEP_NEW in bids
- and len(bids) == 2
):
repo.ui.note(_(b" %s: picking 'changed/deleted' action\n") % f)
mresult.addfile(
@@ -1243,7 +1242,6 @@
if (
mergestatemod.ACTION_DELETED_CHANGED in bids
and mergestatemod.ACTION_GET in bids
- and len(bids) == 2
):
repo.ui.note(_(b" %s: picking 'delete/changed' action\n") % f)
mresult.addfile(