comparison mercurial/merge.py @ 45289:1d1f112da75c

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

45288:3f5ac87ae10f

        mresult.updateactions(fractions)

    prunedactions = sparse.filterupdatesactions(
        repo, wctx, mctx, branchmerge, mresult.actions
    )
    _resolvetrivial(repo, wctx, mctx, ancestors[0], mresult)

    mresult.setactions(prunedactions)
    return mresult


def _getcwd():
    try:

45289:1d1f112da75c

        mresult.updateactions(fractions)

    prunedactions = sparse.filterupdatesactions(
        repo, wctx, mctx, branchmerge, mresult.actions
    )
    mresult.setactions(prunedactions)
    _resolvetrivial(repo, wctx, mctx, ancestors[0], mresult)

    return mresult


def _getcwd():
    try: