diff -r 6877b0ee5f9d -r 590a840fa367 mercurial/sparse.py --- a/mercurial/sparse.py Wed Sep 09 16:49:19 2020 +0530 +++ b/mercurial/sparse.py Wed Sep 16 18:09:32 2020 +0530 @@ -399,7 +399,7 @@ temporaryfiles.append(file) prunedactions[file] = action elif branchmerge: - if type not in mergemod.mergeresult.NO_OP_ACTIONS: + if type not in mergestatemod.NO_OP_ACTIONS: temporaryfiles.append(file) prunedactions[file] = action elif type == mergestatemod.ACTION_FORGET: