94742 2012-08-22 12:20:57 -0700 Don't unconditionally define NOMINMAX on Windows 2012-08-22 14:55:08 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 scottmg scottmg enne webkit.review.bot oldest_to_newest 702180 0 scottmg 2012-08-22 12:20:57 -0700 Don't unconditionally define NOMINMAX on Windows 702183 1 159988 scottmg 2012-08-22 12:22:12 -0700 Created attachment 159988 Patch 702186 2 webkit.review.bot 2012-08-22 12:24:44 -0700 Attachment 159988 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Tools/ChangeLog', u'Tools/TestWebKitAPI/co..." exit_code: 1 Tools/TestWebKitAPI/config.h:46: #ifndef header guard has wrong style, please use: config_h [build/header_guard] [5] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 702189 3 159988 enne 2012-08-22 12:25:47 -0700 Comment on attachment 159988 Patch R=me. Silly style bot. 702258 4 159988 webkit.review.bot 2012-08-22 13:21:50 -0700 Comment on attachment 159988 Patch Rejecting attachment 159988 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: ource/WebCore/ChangeLog CONFLICT (content): Merge conflict in Source/WebCore/ChangeLog Failed to merge in the changes. Patch failed at 0001 Skipping css3/flexbox/flexitem.html. 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/13560388 702285 5 160002 scottmg 2012-08-22 13:41:59 -0700 Created attachment 160002 rebase 702288 6 webkit.review.bot 2012-08-22 13:44:20 -0700 Attachment 160002 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Tools/ChangeLog', u'Tools/TestWebKitAPI/co..." exit_code: 1 Tools/TestWebKitAPI/config.h:46: #ifndef header guard has wrong style, please use: config_h [build/header_guard] [5] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 702384 7 160002 webkit.review.bot 2012-08-22 14:55:05 -0700 Comment on attachment 160002 rebase Clearing flags on attachment: 160002 Committed r126356: <http://trac.webkit.org/changeset/126356> 702385 8 webkit.review.bot 2012-08-22 14:55:08 -0700 All reviewed patches have been landed. Closing bug. 159988 2012-08-22 12:22:12 -0700 2012-08-22 13:41:57 -0700 Patch bug-94742-20120822122210.patch text/plain 1071 scottmg U3VidmVyc2lvbiBSZXZpc2lvbjogMTI2MzI3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZWM4MTQ0ZWFmODAzZjBjMWZjNTYyMWIzYWYxMDc5MmY1 MzJiNmZjNS4uNjAwZTk5Y2MwOTU0ZWFkMDNjMDk0ZGIxMTk1ODYwYWE2NGQ0YThhMCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDEyLTA4LTIyICBTY290dCBHcmFoYW0gIDxzY290dG1nQGNocm9taXVtLm9yZz4KKwor ICAgICAgICBEb24ndCB1bmNvbmRpdGlvbmFsbHkgZGVmaW5lIE5PTUlOTUFYIG9uIFdpbmRvd3MK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk0NzQyCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQXZvaWRzIGEg d2FybmluZyB3aGVuIGJ1aWxkaW5nIG9uIFdpbmRvd3Mgd2hlbiBOT01JTk1BWCBpcyBkZWZpbmVk CisgICAgICAgIGVsc2V3aGVyZSBvciBvbiB0aGUgY29tbWFuZCBsaW5lLgorCisgICAgICAgICog VGVzdFdlYktpdEFQSS9jb25maWcuaDoKKwogMjAxMi0wOC0yMiAgQWxleGV5IFByb3NrdXJ5YWtv diAgPGFwQGFwcGxlLmNvbT4KIAogICAgICAgICBbV0syXSBTdXBwb3J0IHBvc3RpbmcgaW5qZWN0 ZWQgYnVuZGxlIG1lc3NhZ2VzIHRvIGEgcGFnZQpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktp dEFQSS9jb25maWcuaCBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvY29uZmlnLmgKaW5kZXggOTdiYjk1 OGVmODE3OTFkMzk3NjcxZDk2MDdlYzNhYjRlNzhhMDMxNC4uZTc5NmViYzk4NDMzZWNjYzBjZDBk MWNlNWI2ZTk4YTE3ZWMwZDE2ZiAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9jb25m aWcuaAorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL2NvbmZpZy5oCkBAIC00Myw3ICs0Myw5IEBA CiAKICNlbGlmIGRlZmluZWQoV0lOMzIpIHx8IGRlZmluZWQoX1dJTjMyKQogCisjaWZuZGVmIE5P TUlOTUFYCiAjZGVmaW5lIE5PTUlOTUFYCisjZW5kaWYKIAogI2VuZGlmCiAK 160002 2012-08-22 13:41:59 -0700 2012-08-22 14:55:05 -0700 rebase bug-94742-20120822134157.patch text/plain 1081 scottmg U3VidmVyc2lvbiBSZXZpc2lvbjogMTI2MzQ0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNTU5N2JhOWY3YTI0MjRmOWZiM2VhMDQwNjBiOTk0MGM2 MTZjYzE4NC4uMWMxMzVmY2IxZWRhNzZmYmMwMjUxODBmOWY1NzU0OThmMjFjNDc1MyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDEyLTA4LTIyICBTY290dCBHcmFoYW0gIDxzY290dG1nQGNocm9taXVtLm9yZz4KKwor ICAgICAgICBEb24ndCB1bmNvbmRpdGlvbmFsbHkgZGVmaW5lIE5PTUlOTUFYIG9uIFdpbmRvd3MK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk0NzQyCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQXZvaWRzIGEg d2FybmluZyB3aGVuIGJ1aWxkaW5nIG9uIFdpbmRvd3Mgd2hlbiBOT01JTk1BWCBpcyBkZWZpbmVk CisgICAgICAgIGVsc2V3aGVyZSBvciBvbiB0aGUgY29tbWFuZCBsaW5lLgorCisgICAgICAgICog VGVzdFdlYktpdEFQSS9jb25maWcuaDoKKwogMjAxMi0wOC0yMiAgVG9tbXkgV2lkZW5mbHljaHQg IDx0b21teXdAZ29vZ2xlLmNvbT4KIAogICAgICAgICBbY2hyb21pdW1dIE1lZGlhU3RyZWFtIEFQ STogQWRkIE1vY2tXZWJSVENQZWVyQ29ubmVjdGlvbkhhbmRsZXIKZGlmZiAtLWdpdCBhL1Rvb2xz L1Rlc3RXZWJLaXRBUEkvY29uZmlnLmggYi9Ub29scy9UZXN0V2ViS2l0QVBJL2NvbmZpZy5oCmlu ZGV4IDk3YmI5NThlZjgxNzkxZDM5NzY3MWQ5NjA3ZWMzYWI0ZTc4YTAzMTQuLmU3OTZlYmM5ODQz M2VjY2MwY2QwZDFjZTViNmU5OGExN2VjMGQxNmYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJL aXRBUEkvY29uZmlnLmgKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9jb25maWcuaApAQCAtNDMs NyArNDMsOSBAQAogCiAjZWxpZiBkZWZpbmVkKFdJTjMyKSB8fCBkZWZpbmVkKF9XSU4zMikKIAor I2lmbmRlZiBOT01JTk1BWAogI2RlZmluZSBOT01JTk1BWAorI2VuZGlmCiAKICNlbmRpZgogCg==