[Updated] D8827: merge: filter actions before calling _resolvetrivial()

[pulkit (Pulkit Goyal)]

Closed by commit rHG1d1f112da75c: merge: filter actions before calling _resolvetrivial() (authored by pulkit).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D8827?vs=22111&id=22210

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D8827/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D8827

AFFECTED FILES
  mercurial/merge.py

CHANGE DETAILS

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -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
 
 



To: pulkit, #hg-reviewers, indygreg
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20200802/ecd3dd69/attachment-0002.html>