Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/sparse.py
changeset 48713 5dfaca4464d1
parent 48665 a62ba3345534
child 48737 a6efb9180764 
--- 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:
mercurial