99507 2012-10-16 14:08:56 -0700 Commit queue tried to land the wrong patch 2012-10-16 14:50:48 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified NEW P1 Major --- 1 eae webkit-unassigned abarth oldest_to_newest 743543 0 eae 2012-10-16 14:08:56 -0700 In setting cq+ on bug 99376 the commit queue instead tried to land the patch for bug 99435. Luckily this resulted in a merge conflict preventing it from being landed. See https://bugs.webkit.org/show_bug.cgi?id=99376 for details and output. 743570 1 abarth 2012-10-16 14:37:32 -0700 The bug is just that the two patches landed close to each other and the commit-queue didn't know how to resolve the conflict in the ChangeLog. We used to have a merge-driver on the bots that knew how to fix these things, but it had other problems. We just need to teach the bot that it shouldn't bother trying to resolve conflicts when landing. 743578 2 eae 2012-10-16 14:40:57 -0700 (In reply to comment #1) > The bug is just that the two patches landed close to each other and the commit-queue didn't know how to resolve the conflict in the ChangeLog. We used to have a merge-driver on the bots that knew how to fix these things, but it had other problems. We just need to teach the bot that it shouldn't bother trying to resolve conflicts when landing. Are you sure? It looks a lot like it tried to grab the wrong patch as the file it is complaining about (Tools/ChangeLog) isn't even in the patch it should have applied. 743587 3 abarth 2012-10-16 14:48:38 -0700 > Are you sure? I'm not sure. I know we see that error message from time to time and it makes me sad. I'd like to fix it, but I haven't found the time. :( 743589 4 eae 2012-10-16 14:50:48 -0700 Sadness :( Thanks for looking.