måndag 12 juni 2006 23:27 skrev Linus Torvalds: [...] > Does this patch fix it for you (untested - it could result in tons of > other trouble, but it basically just says that time ordering is less > important than member revision ordering). Thanks, it worked on the simple case at least. We'll see about the original full repo later. > > I don't think this is strictly correct, btw. I suspect you can still get > into strange situations where the changeset merging has resulted in one > file ordering one way, and another file ordering the other way. Doesn't cvsps's conflict handing simply break up those patches into several patches? More patches is ok. Suboptimal patches can be accepted -- robin - : 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