comparison mercurial/merge.py @ 22672:19903277f035

merge: use bid merge by default (BC)

In most cases merges will work exactly as before.

The only difference is in criss-cross merge situations where there is multiple
ancestors. Instead of picking an more or less arbitrary ancestor, it will
consider both ancestors and pick the best bids.

Bid merge can be disabled with --config merge.preferancestor='!'.

22671:5220c12c43fd

    if len(ancestors) == 1: # default
        actions = manifestmerge(repo, wctx, mctx, ancestors[0],
                                branchmerge, force,
                                partial, acceptremote, followcopies)

    else: # only when merge.preferancestor=* - experimentalish code
        repo.ui.status(
            _("note: merging %s and %s using bids from ancestors %s\n") %
            (wctx, mctx, _(' and ').join(str(anc) for anc in ancestors)))

        # Call for bids

        overwrite = force and not branchmerge

        p2 = repo[node]
        if pas[0] is None:
            if repo.ui.config("merge", "preferancestor") == '*':
                cahs = repo.changelog.commonancestorsheads(p1.node(), p2.node())
                pas = [repo[anc] for anc in (sorted(cahs) or [nullid])]
            else:
                pas = [p1.ancestor(p2, warn=branchmerge)]

22672:19903277f035

    if len(ancestors) == 1: # default
        actions = manifestmerge(repo, wctx, mctx, ancestors[0],
                                branchmerge, force,
                                partial, acceptremote, followcopies)

    else: # only when merge.preferancestor=* - the default
        repo.ui.status(
            _("note: merging %s and %s using bids from ancestors %s\n") %
            (wctx, mctx, _(' and ').join(str(anc) for anc in ancestors)))

        # Call for bids

        overwrite = force and not branchmerge

        p2 = repo[node]
        if pas[0] is None:
            if repo.ui.config("merge", "preferancestor", '*') == '*':
                cahs = repo.changelog.commonancestorsheads(p1.node(), p2.node())
                pas = [repo[anc] for anc in (sorted(cahs) or [nullid])]
            else:
                pas = [p1.ancestor(p2, warn=branchmerge)]