Re: merge conlict?

["Óscar Fuentes" <ofv@wanadoo.es>]

Andreas Schwab <schwab@linux-m68k.org> writes:

> Óscar Fuentes <ofv@wanadoo.es> writes:
>
>> While bisecting the DAG, either you remain on the left-most part, and
>> then those revisions are ignored, or traverse the merged history too,
>> and then you take into account lots of revisions which were intermediate
>> local points on the development of some feature.
>
> Bisection must always take all parents into account.  Otherwise how can
> it find out the exact revision?

It seems you are thinking too git'ly

For emacs purposes, you are interested on knowing *who* broke the build
and *when* he incorporated the faulty change into upstream's trunk. For
that, it is enough with traversing the left-most part of the DAG (unless
someone turns the left-most part of his personal branch into the
left-most part of upstream trunk, but this shall not happen)

OTOH, there is no guarantee nor requirement that every revision merged
into trunk meet some quality standards, so traversing those merged
revisions is pretty useless.