comparison mercurial/merge.py @ 4179:7e1c8a565a4f

Move branch read/write to dirstate where it belongs

4178:0b48e3985765

    stats = applyupdates(repo, action, wc, p2)

    if not partial:
        recordupdates(repo, action, branchmerge)
        repo.dirstate.setparents(fp1, fp2)
        repo.hook('update', parent1=xp1, parent2=xp2, error=stats[3])
        if not branchmerge:
            repo.opener("branch", "w").write(p2.branch() + "\n")

    return stats

4179:7e1c8a565a4f

    stats = applyupdates(repo, action, wc, p2)

    if not partial:
        recordupdates(repo, action, branchmerge)
        repo.dirstate.setparents(fp1, fp2)
        if not branchmerge:
            repo.dirstate.setbranch(p2.branch())
        repo.hook('update', parent1=xp1, parent2=xp2, error=stats[3])

    return stats