[Monotone-devel] Re: branch review for net.venge.monotone.multihead

[Bruce Stephens]

"Zack Weinberg" <address@hidden> writes:

> I was thinking about using commit date as a further heuristic, i.e.
> when we have two LCAs neither of which is an ancestor of the other,
> merge the newest one first; furthermore, when we have three or more
> heads with the same LCA, merge the newest two first.  However, it
> seems like a huge pain to get from a revision_id to its commit date,
> and in fact I'm not sure the date cert is guaranteed to exist.

I think mtn always creates a date cert.  There may be more than one,
of course (with different values), so there's a certain amount of
flexibility in how you might determine the "newest two".

Intuitively it seems like you might try to merge the two "closest" in
terms of numbers of files that differ, or something.  I've no idea
whether that would be a good heuristic, though.