| Summary: | [Chromium] Remove references to gyp cygwin build target | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Product: | WebKit | Reporter: | Scott Graham <scottmg> | ||||||
| Component: | Tools / Tests | Assignee: | Scott Graham <scottmg> | ||||||
| Status: | RESOLVED FIXED | ||||||||
| Severity: | Normal | CC: | abarth, dglazkov, jam, jchaffraix, webkit.review.bot | ||||||
| Priority: | P2 | ||||||||
| Version: | 528+ (Nightly build) | ||||||||
| Hardware: | Unspecified | ||||||||
| OS: | Unspecified | ||||||||
| Attachments: |
|
||||||||
|
Description
Scott Graham
2012-01-27 15:36:23 PST
Created attachment 124385 [details]
Patch
sweet! (i'm not a reviewer) Comment on attachment 124385 [details] Patch Rejecting attachment 124385 [details] from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: nt): Merge conflict in LayoutTests/ChangeLog Failed to merge in the changes. Patch failed at 0001 css3/flexbox/cross-axis-scrollbar.html ref test fails on Windows Chromium bots When you have resolved this problem run "git rebase --continue". If you would prefer to skip this patch, instead run "git rebase --skip". To restore the original branch and stop rebasing run "git rebase --abort". rebase refs/remotes/origin/master: command returned error: 1 Died at Tools/Scripts/update-webkit line 164. Full output: http://queues.webkit.org/results/11368712 Created attachment 124622 [details]
Patch
(try rebasing changelogs...) Comment on attachment 124622 [details]
Patch
Adam reviewed the patch properly, just forwarding his r+ to the rebase.
Comment on attachment 124622 [details] Patch Clearing flags on attachment: 124622 Committed r106391: <http://trac.webkit.org/changeset/106391> All reviewed patches have been landed. Closing bug. |