96545 2012-09-12 12:50:50 -0700 [Qt] syncqt isn't re-run when WebKit1.pro changes and we're building with --no-webkit2 2012-09-13 01:50:30 -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 718624 0 hausmann 2012-09-12 12:50:50 -0700 [Qt] syncqt isn't re-run when WebKit1.pro changes and we're building with --no-webkit2 718627 1 163673 hausmann 2012-09-12 12:52:05 -0700 Created attachment 163673 Patch 719239 2 163673 webkit.review.bot 2012-09-13 01:44:28 -0700 Comment on attachment 163673 Patch Rejecting attachment 163673 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: NFLICT (content): Merge conflict in Source/WebCore/ChangeLog Failed to merge in the changes. Patch failed at 0001 Web Inspector: CSS domain sends events while it is not enabled 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/13850045 719242 3 hausmann 2012-09-13 01:50:30 -0700 Committed r128429: <http://trac.webkit.org/changeset/128429> 163673 2012-09-12 12:52:05 -0700 2012-09-13 01:44:28 -0700 Patch bug-96545-20120912215352.patch text/plain 1770 hausmann U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4MzA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvYXBpLnByaSBi L1NvdXJjZS9hcGkucHJpCmluZGV4IGRhM2EwOGRmMmM1ZjY0ZjFmM2Y3MWZiNzNiNjIzYTFiNDVk NzQzZDUuLjE4YmI1OTA2NTc1YjI1MjM0YWE0OTVmZmQ4MjQwM2UwZjdkMWZhNjYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9hcGkucHJpCisrKyBiL1NvdXJjZS9hcGkucHJpCkBAIC03MSwxNSArNzEsMTIg QEAgbWFjeCB7CiBXRUJLSVQgKz0gd3RmIGphdmFzY3JpcHRjb3JlIHdlYmNvcmUKIAogYnVpbGQ/ KHdlYmtpdDEpOiBXRUJLSVQgKz0gd2Via2l0MQorYnVpbGQ/KHdlYmtpdDIpOiBXRUJLSVQgKz0g d2Via2l0MgogCi1idWlsZD8od2Via2l0MikgewotICAgIFdFQktJVCArPSB3ZWJraXQyCi0KLSAg ICAjIEVuc3VyZSB0aGF0IGNoYW5nZXMgdG8gdGhlIFdlYktpdDEgYW5kIFdlYktpdDIgQVBJIHdp bGwgdHJpZ2dlciBhIHFtYWtlIG9mIHRoaXMKLSAgICAjIGZpbGUsIHdoaWNoIGluIHR1cm4gcnVu cyBzeW5jcXQgdG8gdXBkYXRlIHRoZSBmb3J3YXJkaW5nIGhlYWRlcnMuCi0gICAgUU1BS0VfSU5U RVJOQUxfSU5DTFVERURfRklMRVMgKj0gV2ViS2l0Mi9UYXJnZXQucHJpCi0gICAgUU1BS0VfSU5U RVJOQUxfSU5DTFVERURfRklMRVMgKj0gV2ViS2l0L1dlYktpdDEucHJvCi19CisjIEVuc3VyZSB0 aGF0IGNoYW5nZXMgdG8gdGhlIFdlYktpdDEgYW5kIFdlYktpdDIgQVBJIHdpbGwgdHJpZ2dlciBh IHFtYWtlIG9mIHRoaXMKKyMgZmlsZSwgd2hpY2ggaW4gdHVybiBydW5zIHN5bmNxdCB0byB1cGRh dGUgdGhlIGZvcndhcmRpbmcgaGVhZGVycy4KK2J1aWxkPyh3ZWJraXQxKTogUU1BS0VfSU5URVJO QUxfSU5DTFVERURfRklMRVMgKj0gV2ViS2l0L1dlYktpdDEucHJvCitidWlsZD8od2Via2l0Mik6 IFFNQUtFX0lOVEVSTkFMX0lOQ0xVREVEX0ZJTEVTICo9IFdlYktpdDIvVGFyZ2V0LnByaQogCiB1 c2U/KDNEX0dSQVBISUNTKTogV0VCS0lUICs9IGFuZ2xlCiAKZGlmZiAtLWdpdCBhL0NoYW5nZUxv ZyBiL0NoYW5nZUxvZwppbmRleCBkOGI5NmYwOGIxM2NkN2Q3ZGU1MmFlMjkyYjI0MWNiN2RiNWQx ZjkxLi4zMjA2NWYwZGE4YzIwMGUyMjk4M2MwOTBmNjY2NjljMWJhNDQxZDU3IDEwMDY0NAotLS0g YS9DaGFuZ2VMb2cKKysrIGIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTItMDktMTIg IFNpbW9uIEhhdXNtYW5uICA8c2ltb24uaGF1c21hbm5Abm9raWEuY29tPgorCisgICAgICAgIFtR dF0gc3luY3F0IGlzbid0IHJlLXJ1biB3aGVuIFdlYktpdDEucHJvIGNoYW5nZXMgYW5kIHdlJ3Jl IGJ1aWxkaW5nIHdpdGggLS1uby13ZWJraXQyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD05NjU0NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIERvIHRoZSBRTUFLRV9JTlRFUk5BTF9JTkNMVURFRF9GSUxFUyB0 cmljayBzZXBhcmF0ZWx5IGZvciBXZWJLaXQxLnBybyBhbmQgV2ViS2l0Mi9UYXJnZXQucHJpLAor ICAgICAgICBkZXBlbmRpbmcgb24gYnVpbGQ/KHdlYmtpdDEpIGFuZCBidWlsZD8od2Via2l0Miks IGFzIGRpc2N1c3NlZCBlYXJsaWVyLgorCisgICAgICAgICogU291cmNlL2FwaS5wcmk6CisKIDIw MTItMDktMTEgIFJ5dWFuIENob2kgIDxyeXVhbi5jaG9pQHNhbXN1bmcuY29tPgogCiAgICAgICAg IFtDTUFLRV0gU3VwcGx5IGZlYXR1cmUgZGVmaW5lcyB0byBDb2RlR2VuZXJhdG9yVGVzdFJ1bm5l ci4K