On Wed, 10 Oct 2007, Miklos Vajna wrote: > > Actually, specifically darcs, different merges _always_ result in the same > data. No they don't. You don't understand the problem. Yes, different merges WITH THE SAME PATCHES always result in the same data. But that's not a realistic - or even very interesting - schenario. What's much more common is that the same problem gets solved slightly differently in two different branches. For example, maybe somebody does it as two different patches - where the second one fixes a bug in the first fix. And another person does the same fix, but without the bug in the first place. See? A patch-based system gets confused by those kinds of issues (or they turn into various special cases). And that is fundamentally why you MUST NOT take history into account (where "history" is some series of individual patches). Yes, history is interesting for historical reasons, and to explain what the context was, but in many ways, history is exactly the *wrong* thing to use when it comes to merging. You should look at the end result, since people can - and do - come to the same result through different ways. Linus - 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
