Bug 209125
| Summary: | old commit-queue sometimes fail to commit because of files being out of date | ||
|---|---|---|---|
| Product: | WebKit | Reporter: | Aakash Jain <aakash_jain> |
| Component: | Tools / Tests | Assignee: | Nobody <webkit-unassigned> |
| Status: | RESOLVED CONFIGURATION CHANGED | ||
| Severity: | Normal | CC: | webkit-bug-importer |
| Priority: | P2 | Keywords: | InRadar |
| Version: | Other | ||
| Hardware: | Unspecified | ||
| OS: | Unspecified | ||
Aakash Jain
old commit-queue sometimes fail to commit because of files being out of date. e.g.: https://bugs.webkit.org/show_bug.cgi?id=209088#c10
ERROR from SVN:
Item is out of date: File '/trunk/LayoutTests/ChangeLog' is out of date
W: 23fe8aff4c70caece1e47234baecb63c93028b07 and refs/remotes/origin/master differ, using rebase:
:040000 040000 13393f41d126e8f5e02c69124c1de79643a1a8df faa930175bf1f627b95b2085415cfd51e1758370 M LayoutTests
Current branch master is up to date.
ERROR: Not all changes have been committed into SVN, however the committed
ones (if any) seem to be successfully integrated into the working tree.
Please see the above messages for details.
Failed to run "['git', 'svn', 'dcommit', '--rmdir']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit
| Attachments | ||
|---|---|---|
| Add attachment proposed patch, testcase, etc. |
Aakash Jain
This is probably because during the time patch was applied, and attempted to committed, there was another commit which modified one of the file being modified by the patch.
The chances of this happening seems higher with large patches.
From the logs on :
2020-03-13 23:34:21,893 - Running: webkit-patch --status-host=webkit-queues.webkit.org --bot-id=webkit-cq-03 land-attachment --force-clean --non-interactive --parent-command=commit-queue 393570 --port=mac
2020-03-14 00:10:44,032 - Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-03', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 393570, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit
There was a commit https://trac.webkit.org/changeset/258462/webkit at 11:43:46 PM which also modified LayoutTests/ChangeLog.
Aakash Jain
commit-queue has been re-implemented from scratch. old commit-queue has been decommissioned.
Radar WebKit Bug Importer
<rdar://problem/60722829>