Bug 43756 - [chromium] Feature defines are out of sync between features.gypi and downstream feature_overrides.gypi
Summary: [chromium] Feature defines are out of sync between features.gypi and downstre...
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: New Bugs (show other bugs)
Version: 528+ (Nightly build)
Hardware: Other OS X 10.5
: P2 Normal
Assignee: James Robinson
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2010-08-09 16:21 PDT by James Robinson
Modified: 2010-08-10 11:13 PDT (History)
2 users (show)

See Also:

Attachments
Patch (2.91 KB, patch)
2010-08-09 16:24 PDT, James Robinson 		no flags Details | Formatted Diff | Diff
View All 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 James Robinson 2010-08-09 16:21:19 PDT 
[chromium] Feature defines are out of sync between features.gypi and downstream feature_overrides.gypi
Comment 1 James Robinson 2010-08-09 16:24:23 PDT 
Created attachment 63948 [details]
Patch
Comment 2 Dimitri Glazkov (Google) 2010-08-09 16:25:20 PDT 
Comment on attachment 63948 [details]
Patch

<3
Comment 3 WebKit Commit Bot 2010-08-09 21:50:26 PDT 
Comment on attachment 63948 [details]
Patch

Rejecting patch 63948 from commit-queue.

Failed to run "['WebKitTools/Scripts/update-webkit']" exit_code: 2
Updating OpenSource
fatal: Unable to create '/Users/eseidel/Projects/CommitQueue/.git/svn/refs/remotes/trunk/index.lock': File exists.

If no other git process is currently running, this probably means a
git process crashed in this repository earlier. Make sure no other git
process is running and remove the file manually to continue.
write-tree: command returned error: 128

Died at WebKitTools/Scripts/update-webkit line 129.

Full output: http://queues.webkit.org/results/3709005
Comment 4 James Robinson 2010-08-10 10:27:31 PDT 
Comment on attachment 63948 [details]
Patch

Will land manually.  c-q is borked
Comment 5 James Robinson 2010-08-10 10:34:27 PDT 
Comment on attachment 63948 [details]
Patch

Clearing flags on attachment: 63948

Committed r65076: <http://trac.webkit.org/changeset/65076>
Comment 6 James Robinson 2010-08-10 10:34:31 PDT 
All reviewed patches have been landed.  Closing bug.
Comment 7 Eric Seidel (no email) 2010-08-10 11:13:48 PDT 
Sorry.  The commit-queue has not been feeling well as of late.  I put it back on its original hardware last night, but it had a git lock left around from being unceremoniously powered down before the move. :(

I believe it should be feeling better now.   Then again, I've said that before and been wrong...