mercurial/merge.py

3295:72d1e521da77

    action += manifestmerge(repo, wc, p2, pa, overwrite, partial)

    ### apply phase

    if not branchmerge:
        # we don't need to do any magic, just jump to the new rev
        p1, p2 = p2, repo.changectx(nullid)

    xp1, xp2 = str(p1), str(p2)
    if not p2: xp2 = ''

    repo.hook('preupdate', throw=True, parent1=xp1, parent2=xp2)

    updated, merged, removed, unresolved = applyupdates(repo, action, xp1, xp2)

    # update dirstate
    if not partial:
        recordupdates(repo, action, branchmerge)
        repo.dirstate.setparents(p1.node(), p2.node())

    if show_stats:
        stats = ((updated, _("updated")),
                 (merged - unresolved, _("merged")),
                 (removed, _("removed")),

                repo.ui.status(_("(branch merge, don't forget to commit)\n"))
        elif unresolved:
            repo.ui.status(_("There are unresolved merges with"
                             " locally modified files.\n"))

    repo.hook('update', parent1=xp1, parent2=xp2, error=unresolved)
    return unresolved

3296:20087b4bc6f9

    action += manifestmerge(repo, wc, p2, pa, overwrite, partial)

    ### apply phase

    if not branchmerge:
        # just jump to the new rev
        fp1, fp2, xp1, xp2 = p2.node(), nullid, str(p2), ''
    else:
        fp1, fp2, xp1, xp2 = p1.node(), p2.node(), str(p1), str(p2)

    if not partial:
        repo.hook('preupdate', throw=True, parent1=xp1, parent2=xp2)

    updated, merged, removed, unresolved = applyupdates(repo, action, xp1, xp2)

    # update dirstate
    if not partial:
        recordupdates(repo, action, branchmerge)
        repo.dirstate.setparents(fp1, fp2)
        repo.hook('update', parent1=xp1, parent2=xp2, error=unresolved)

    if show_stats:
        stats = ((updated, _("updated")),
                 (merged - unresolved, _("merged")),
                 (removed, _("removed")),

                repo.ui.status(_("(branch merge, don't forget to commit)\n"))
        elif unresolved:
            repo.ui.status(_("There are unresolved merges with"
                             " locally modified files.\n"))

    return unresolved