On Sun, Sep 07, 2008 at 10:22:02PM +0200, Stephen R. van den Berg wrote: > >But then it will fail to find legitimate merge bases. So yes, you _can_ > > Will it? Can you give me one example where it would find the wrong one? How about the example I gave already? The first merge-base is E, but that is not correct for the merge I gave. So you propose an algorithm which will find A. But now imagine the exact some topology, but there was no cherry-pick; instead, E' is actually a merge. Wouldn't E be the right merge-base then? And yes, of course the _content_ of the trees in E' will be different in those two cases. But the shape of the history graph will be the same, and that is the only thing that goes into finding a merge base. -Peff -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
