96008 2012-09-06 12:39:47 -0700 [Qt] Fix debug Windows build 2012-09-06 21:38:24 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 hausmann hausmann vestbo webkit.review.bot oldest_to_newest 713583 0 hausmann 2012-09-06 12:39:47 -0700 [Qt] Fix debug Windows build 713584 1 162558 hausmann 2012-09-06 12:41:05 -0700 Created attachment 162558 Patch 713884 2 162558 webkit.review.bot 2012-09-06 17:20:27 -0700 Comment on attachment 162558 Patch Rejecting attachment 162558 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: F/ChangeLog CONFLICT (content): Merge conflict in Source/WTF/ChangeLog Failed to merge in the changes. Patch failed at 0001 ENH: Add Logging to StringImpl to track String Types 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/13778366 714072 3 hausmann 2012-09-06 21:38:24 -0700 Committed r127819: <http://trac.webkit.org/changeset/127819> 162558 2012-09-06 12:41:05 -0700 2012-09-06 17:20:26 -0700 Patch bug-96008-20120906214246.patch text/plain 1616 hausmann U3VidmVyc2lvbiBSZXZpc2lvbjogMTI3NzY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2UyNjk4YTAxMzUwMDI2 NjgwZTg3NzgwYjVlNzMzYjY0ZWJkYjk0My4uMDZhNjllNWRhNDY2YmQwODNmMTIyMGVlMTZiNmE5 YzMxZGQyNGJkZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTA5LTA2ICBTaW1v biBIYXVzbWFubiAgPHNpbW9uLmhhdXNtYW5uQG5va2lhLmNvbT4KKworICAgICAgICBbUXRdIEZp eCBkZWJ1ZyBXaW5kb3dzIGJ1aWxkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD05NjAwOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEFkZCBhIGZldyBtb3JlIGZpbGVzIHRvIHRoZSBBbGxJbk9uZSBjb25maWd1 cmF0aW9uIHRvIHJlZHVjZSB0aGUgbnVtYmVyIG9mIG9iamVjdCBmaWxlcworICAgICAgICBhbmQg dGhlaXIgdG90YWwgc2l6ZSwgYWxsb3dpbmcgYSBkZWJ1ZyBidWlsZCB3aXRoIE1TVkMgYWdhaW4u CisKKyAgICAgICAgKiBUYXJnZXQucHJpOgorCiAyMDEyLTA5LTA2ICBEYXZpZCBCYXJ0b24gIDxk YmFydG9uQG1hdGhzY3JpYmUuY29tPgogCiAgICAgICAgIG1hdGhtbC5jc3M6IEFkZCBtb3JlIHsg d2hpdGUtc3BhY2U6IG5vd3JhcCB9IGRlY2xhcmF0aW9ucwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvVGFyZ2V0LnByaSBiL1NvdXJjZS9XZWJDb3JlL1RhcmdldC5wcmkKaW5kZXggNTlhNTIy NWMyMGIxNmE3MTgwNmM3YzMxNDU0NmI3MzJmNTljZjIzNC4uYWVjZTZhNjFkMTU5ZGI5NTQ5NDIw ZmM0YmY3ZDNjMzAwZGEzNmZjMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvVGFyZ2V0LnBy aQorKysgYi9Tb3VyY2UvV2ViQ29yZS9UYXJnZXQucHJpCkBAIC0zNzQ2LDYgKzM3NDYsNyBAQCBj b250YWlucyhERUZJTkVTLCBFTkFCTEVfU1ZHPTEpIHsKICAgICAgICAgc3ZnL1NWR1pvb21FdmVu dC5jcHAKIAogICAgIEFMTF9JTl9PTkVfU09VUkNFUyArPSBcCisgICAgICAgIHJlbmRlcmluZy9z dmcvUmVuZGVyU1ZHQWxsSW5PbmUuY3BwIFwKICAgICAgICAgc3ZnL1NWR0FsbEluT25lLmNwcAog fQogCkBAIC00MDEzLDcgKzQwMTQsOSBAQCBjb250YWlucyhERUZJTkVTLCBXVEZfVVNFX0dSQVBI SUNTX1NVUkZBQ0U9MSkgewogCiBBTExfSU5fT05FX1NPVVJDRVMgKz0gXAogICAgIGFjY2Vzc2li aWxpdHkvQWNjZXNzaWJpbGl0eUFsbEluT25lLmNwcCBcCi0gICAgaW5zcGVjdG9yL0luc3BlY3Rv ckFsbEluT25lLmNwcAorICAgIGluc3BlY3Rvci9JbnNwZWN0b3JBbGxJbk9uZS5jcHAgXAorICAg IGxvYWRlci9hcHBjYWNoZS9BcHBsaWNhdGlvbkNhY2hlQWxsSW5PbmUuY3BwIFwKKyAgICByZW5k ZXJpbmcvc3R5bGUvU3R5bGVBbGxJbk9uZS5jcHAKIAogY29udGFpbnMoREVGSU5FUywgRU5BQkxF X1hTTFQ9MSk6Y29udGFpbnMoREVGSU5FUywgV1RGX1VTRV9MSUJYTUwyPTEpIHsKICAgICBBTExf SU5fT05FX1NPVVJDRVMgKz0gXAo=