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...
Created attachment 34871 [details] First attempt
I'm testing this patch on the commit-queue bot now. If it works well, I'll mark it for review (with a ChangeLog).
Nice! Have you tested the case where there are conflicts?
If there are conflicts, the update will fail and throw and exception, and then the patch landing will fail like normal.
We should also not commit-queue- the patch when this happens because it's not the patches fault!
Yes. I will post a patch to fix this as described in https://bugs.webkit.org/show_bug.cgi?id=28831#c16 shortly.
Made some progress on this, but the fix will have to wait until next week at this point.
*** Bug 27355 has been marked as a duplicate of this bug. ***
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.
Created attachment 40122 [details] Add update auto-recovery
Comment on attachment 40122 [details] Add update auto-recovery Yay. I'm tired of having my patches rejected by this bug.
Comment on attachment 40122 [details] Add update auto-recovery Clearing flags on attachment: 40122 Committed r48762: <http://trac.webkit.org/changeset/48762>
All reviewed patches have been landed. Closing bug.