Bug 99507 - Commit queue tried to land the wrong patch
Summary: Commit queue tried to land the wrong patch
Status: NEW
Alias: None
Product: WebKit
Classification: Unclassified
Component: Tools / Tests (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P1 Major
Assignee: Nobody
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-10-16 14:08 PDT by Emil A Eklund
Modified: 2012-10-16 14:50 PDT (History)
1 user (show)

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Emil A Eklund 2012-10-16 14:08:56 PDT 
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.
Comment 1 Adam Barth 2012-10-16 14:37:32 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.
Comment 2 Emil A Eklund 2012-10-16 14:40:57 PDT 
(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.
Comment 3 Adam Barth 2012-10-16 14:48:38 PDT 
> 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.  :(
Comment 4 Emil A Eklund 2012-10-16 14:50:48 PDT 
Sadness :(

Thanks for looking.