mercurial/merge.py
changeset 45290 d70c972cec74
parent 45289 1d1f112da75c
child 45291 26fa2eebc291
--- a/mercurial/merge.py	Fri Jul 24 19:13:20 2020 +0530
+++ b/mercurial/merge.py	Fri Jul 24 19:19:47 2020 +0530
@@ -1130,10 +1130,7 @@
         fractions = _forgetremoved(wctx, mctx, branchmerge)
         mresult.updateactions(fractions)
 
-    prunedactions = sparse.filterupdatesactions(
-        repo, wctx, mctx, branchmerge, mresult.actions
-    )
-    mresult.setactions(prunedactions)
+    sparse.filterupdatesactions(repo, wctx, mctx, branchmerge, mresult)
     _resolvetrivial(repo, wctx, mctx, ancestors[0], mresult)
 
     return mresult