[PATCH 1 of 6 bid merge v2] ancestors: return all common ancestor heads - not just the most distant

[Matt Mackall]

On Mon, 2014-04-07 at 02:18 +0200, Mads Kiilerich wrote:
> # HG changeset patch
> # User Mads Kiilerich <madski at unity3d.com>
> # Date 1393278134 -3600
> #      Mon Feb 24 22:42:14 2014 +0100
> # Node ID 6ab1d2340403e890b0719b6b8c6771171cf55204
> # Parent  12f161f08d744f0e4b6eef9c905670afb5c24dd4
> ancestors: return all common ancestor heads - not just the most distant

We're going to need the old single-ancestor merge algorithm around for a
few releases. That algorithm needs to choose a "best" ancestor and the
heuristic it uses for that is the one you're deleting. So this approach
is simply not going to work. We'll probably need to add another function
or flag.

(In fact, we're probably always going to need an algorithm that gives us
a single "best" ancestor.)

-- 
Mathematics is the supreme nostalgia of our time.