Mercurial > hg

diff mercurial/merge.py @ 45630:588068d5f2da

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Pulkit Goyal <7895pulkit@gmail.com>
date Fri, 02 Oct 2020 18:40:39 +0530
parents e8078af6af30
children ebc14a2ad23d
line wrap: on
line diff
--- 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(