comparison mercurial/merge.py @ 6762:f67d1468ac50

util: add sort helper

6761:cb981fc955fb

def applyupdates(repo, action, wctx, mctx):
    "apply the merge action list to the working directory"

    updated, merged, removed, unresolved = 0, 0, 0, 0
    action.sort()

    ms = mergestate(repo)
    ms.reset(wctx.parents()[0].node())
    moves = []

    # prescan for merges
    for a in action:
        f, m = a[:2]
        if m == 'm': # merge

6762:f67d1468ac50

def applyupdates(repo, action, wctx, mctx):
    "apply the merge action list to the working directory"

    updated, merged, removed, unresolved = 0, 0, 0, 0
    ms = mergestate(repo)
    ms.reset(wctx.parents()[0].node())
    moves = []
    action.sort()

    # prescan for merges
    for a in action:
        f, m = a[:2]
        if m == 'm': # merge