On Fri, Aug 22, 2008 at 09:37:30PM +0200, Björn Steinbrink wrote: > Yep, and that's totally correct as far as bisect is concerned. The > parents of that merge commit are: > 88fa08f67bee1a0c765237bdac106a32872f57d2 > b1b135c8d619cb2c7045d6ee4e48375882518bb5 > > And Alan marked both of them as good. > > So, unless Alan made a mistake during his bisection, each of the > branches is correct, but the merge did not lead to a correct result. So > while there were no textual conflicts, there were still incompatible > changes regarding the code semantics and compatibility was not restored > during the merge. One thing that I have seen proposed (but never tried myself) is that you can linearize the changes using "rebase -i" (or cherry-picking), and then bisect that result. That is, given a history A-B-C-D \ / E-F where the merge "D" introduces the bug, you could try creating: A-B-C-E'-F' and bisecting that. And you should know that C is good from your previous bisection, but that F' probably is not, since it should be textually the same as D (unless, of course, you had textual conflicts during the rebase that you fixed up differently). So in essence you are testing each of E and F, but based on the other work. So you should be able to find the one patch that causes the conflict. And depending on the conflict, you may get more information by doing it the other way. I.e.,: A-E-F-B'-C' -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
