comparison mercurial/merge.py @ 18036:8b846dbc57b6

merge: support calculating merge actions against non-working contexts

This is not currently used.  It is instead a pre-requisite to
performing non-conflicting grafts in memory, which a subsequent patch
will do.

18035:5881d5b7552f

            _checkcollision(mctx, None)
        else:
            _checkcollision(mctx, tctx)
    if not force:
        _checkunknown(repo, tctx, mctx)
    action += _forgetremoved(tctx, mctx, branchmerge)
    action += manifestmerge(repo, tctx, mctx,
                            ancestor,
                            force and not branchmerge,
                            partial)
    return action

18036:8b846dbc57b6

            _checkcollision(mctx, None)
        else:
            _checkcollision(mctx, tctx)
    if not force:
        _checkunknown(repo, tctx, mctx)
    if tctx.rev() is None:
        action += _forgetremoved(tctx, mctx, branchmerge)
    action += manifestmerge(repo, tctx, mctx,
                            ancestor,
                            force and not branchmerge,
                            partial)
    return action