# HG changeset patch
# User Pulkit Goyal <7895pulkit@gmail.com>
# Date 1595598200 -19800
# Node ID 1d1f112da75ccdfc87a17f34b71dcc770a94b9ac
# Parent  3f5ac87ae10f2e34c00802061e0fae96c6888bc7
merge: filter actions before calling _resolvetrivial()

In d49e490a9e85252886fd43258803bcad4fc88edb I made _resolvetrivial() to be
called after upadting the sparse checkout.

Looking at the code now, it seems to that me there is no need to even run
_resolvetrivial() on actions which are filtered away.

So let's update the actions before passing them into _resolvetrivial().

Differential Revision: https://phab.mercurial-scm.org/D8827

diff -r 3f5ac87ae10f -r 1d1f112da75c mercurial/merge.py
--- a/mercurial/merge.py	Fri Jul 24 18:16:29 2020 +0530
+++ b/mercurial/merge.py	Fri Jul 24 19:13:20 2020 +0530
@@ -1133,9 +1133,9 @@
     prunedactions = sparse.filterupdatesactions(
         repo, wctx, mctx, branchmerge, mresult.actions
     )
+    mresult.setactions(prunedactions)
     _resolvetrivial(repo, wctx, mctx, ancestors[0], mresult)
 
-    mresult.setactions(prunedactions)
     return mresult