Mercurial Mercurial > hg-stable / 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 45477 14b3dbfa4eeb
parent 45392 77b8588dd84e
child 45531 590a840fa367 
--- 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:
hg-stable