Summary: | Commit queue tried to land the wrong patch | ||
---|---|---|---|
Product: | WebKit | Reporter: | Emil A Eklund <eae> |
Component: | Tools / Tests | Assignee: | Nobody <webkit-unassigned> |
Status: | NEW --- | ||
Severity: | Major | CC: | abarth |
Priority: | P1 | ||
Version: | 528+ (Nightly build) | ||
Hardware: | Unspecified | ||
OS: | Unspecified |
Description
Emil A Eklund
2012-10-16 14:08:56 PDT
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. (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. > 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. :(
Sadness :( Thanks for looking. |