Bug 28316

Summary:

commit-queue should auto-retry patches which fail to commit due to out of date files

Product:

WebKit

Reporter:

Eric Seidel (no email) <eric>

Component:

Tools / Tests

Assignee:

Nobody <webkit-unassigned>

Status:

RESOLVED FIXED

Severity:

Normal

CC:

abarth, commit-queue

Priority:

Version:

528+ (Nightly build)

Hardware:

OS:

OS X 10.5

Attachments:

Description	Flags
First attempt	none
Add update auto-recovery	none

Eric Seidel (no email)

Reported 2009-08-14 13:25:23 PDT

bugzilla-tool land-patches needs to know how to run update-webkit when commits fail If the commit fails due to an out-of-date file. I'm about to write a patch to fix this...

Attachments
First attempt (1.41 KB, patch) 2009-08-14 14:02 PDT, Eric Seidel (no email)	no flags	Details Formatted Diff Diff
Add update auto-recovery (10.01 KB, patch) 2009-09-25 10:46 PDT, Eric Seidel (no email)	no flags	Details Formatted Diff Diff
Show Obsolete (1) View All Add attachment proposed patch, testcase, etc.

Eric Seidel (no email)

Comment 1 2009-08-14 14:02:09 PDT

Created attachment 34871 [details] First attempt

Eric Seidel (no email)

Comment 2 2009-08-14 14:11:34 PDT

I'm testing this patch on the commit-queue bot now. If it works well, I'll mark it for review (with a ChangeLog).

Adam Barth

Comment 3 2009-08-14 22:32:00 PDT

Nice! Have you tested the case where there are conflicts?

Eric Seidel (no email)

Comment 4 2009-08-14 23:04:25 PDT

If there are conflicts, the update will fail and throw and exception, and then the patch landing will fail like normal.

Adam Barth

Comment 5 2009-09-11 11:40:02 PDT

We should also not commit-queue- the patch when this happens because it's not the patches fault!

Eric Seidel (no email)

Comment 6 2009-09-11 11:42:37 PDT

Yes. I will post a patch to fix this as described in https://bugs.webkit.org/show_bug.cgi?id=28831#c16 shortly.

Eric Seidel (no email)

Comment 7 2009-09-11 19:08:15 PDT

Made some progress on this, but the fix will have to wait until next week at this point.

Eric Seidel (no email)

Comment 8 2009-09-16 13:47:52 PDT

*** Bug 27355 has been marked as a duplicate of this bug. ***

Eric Seidel (no email)

Comment 9 2009-09-25 10:37:04 PDT

Changing the title since I'm not yet able to automatically update and resolve ChangeLog conflicts. Right now we just auto-retry patches which failed due to files out of date.

Eric Seidel (no email)

Comment 10 2009-09-25 10:46:23 PDT

Created attachment 40122 [details] Add update auto-recovery

Adam Barth

Comment 11 2009-09-25 10:53:16 PDT

Comment on attachment 40122 [details] Add update auto-recovery Yay. I'm tired of having my patches rejected by this bug.

WebKit Commit Bot

Comment 12 2009-09-25 11:28:01 PDT

Comment on attachment 40122 [details] Add update auto-recovery Clearing flags on attachment: 40122 Committed r48762: <http://trac.webkit.org/changeset/48762>

WebKit Commit Bot

Comment 13 2009-09-25 11:28:11 PDT

All reviewed patches have been landed. Closing bug.

Note You need to log in before you can comment on or make changes to this bug.