Mercurial > public > mercurial-scm > hg-stable

diff mercurial/sparse.py @ 48727:5dfaca4464d1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge-actions: add an explicite "no_op" attribute This make the MergeAction smarter and able to describe themself. This is useful to help introducing more MergeAction object that better the complexity of the situation. Differential Revision: https://phab.mercurial-scm.org/D12116
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 28 Jan 2022 15:19:58 +0100
parents a62ba3345534
children a6efb9180764
line wrap: on
line diff
--- a/mercurial/sparse.py	Fri Jan 28 19:46:37 2022 +0100
+++ b/mercurial/sparse.py	Fri Jan 28 15:19:58 2022 +0100
@@ -396,7 +396,7 @@
             temporaryfiles.append(file)
             prunedactions[file] = action
         elif branchmerge:
-            if type not in mergestatemod.NO_OP_ACTIONS:
+            if not type.no_op:
                 temporaryfiles.append(file)
                 prunedactions[file] = action
         elif type == mergestatemod.ACTION_FORGET: