Mercurial > public > mercurial-scm > hg-stable

diff mercurial/sparse.py @ 45477:14b3dbfa4eeb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mergeresult: introduce dedicated tuple for no-op actions This will help us in adding more no-op actions in next patch while keeping the code cleaner.
author Pulkit Goyal <7895pulkit@gmail.com>
date Mon, 14 Sep 2020 13:51:39 +0530
parents 77b8588dd84e
children 590a840fa367
line wrap: on
line diff
--- a/mercurial/sparse.py	Fri Jun 19 13:27:46 2020 +0200
+++ b/mercurial/sparse.py	Mon Sep 14 13:51:39 2020 +0530
@@ -399,7 +399,7 @@
             temporaryfiles.append(file)
             prunedactions[file] = action
         elif branchmerge:
-            if type != mergestatemod.ACTION_KEEP:
+            if type not in mergemod.mergeresult.NO_OP_ACTIONS:
                 temporaryfiles.append(file)
                 prunedactions[file] = action
         elif type == mergestatemod.ACTION_FORGET: