77462 2012-01-31 11:53:41 -0800 update_webgl_conformance_tests.py fails to detect the SCM being used 2012-01-31 15:11:31 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ehsan ehsan kbr webkit.review.bot oldest_to_newest 546317 0 ehsan 2012-01-31 11:53:41 -0800 This is caused by detect_scm_system no longer being exported from the scm module. 546323 1 124790 ehsan 2012-01-31 11:59:18 -0800 Created attachment 124790 Patch 546335 2 webkit.review.bot 2012-01-31 12:02:10 -0800 Attachment 124790 did not pass style-queue: Failed to run "['Tools/Scripts/update-webkit']" exit_code: 9 Updating OpenSource From git://git.webkit.org/WebKit b20e8a8..0d303ad master -> origin/master Partial-rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc ... Currently at 106376 = b20e8a895f05dd841cd264088d3b83af0e98a788 r106377 = 0d303add2919f49b485767126a3a9ddd6d40b7cf Done rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc First, rewinding head to replay your work on top of it... Applying: Fix compilation errors on build-webkit --debug --no-workers on mac. Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging LayoutTests/ChangeLog CONFLICT (content): Merge conflict in LayoutTests/ChangeLog Auto-merging LayoutTests/platform/qt/Skipped CONFLICT (content): Merge conflict in LayoutTests/platform/qt/Skipped Auto-merging Source/WebCore/ChangeLog CONFLICT (content): Merge conflict in Source/WebCore/ChangeLog Auto-merging Source/WebCore/WebCore.exp.in Auto-merging Source/WebKit/mac/ChangeLog CONFLICT (content): Merge conflict in Source/WebKit/mac/ChangeLog Failed to merge in the changes. Patch failed at 0001 Fix compilation errors on build-webkit --debug --no-workers on mac. 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. If any of these errors are false positives, please file a bug against check-webkit-style. 546348 3 124790 kbr 2012-01-31 12:13:14 -0800 Comment on attachment 124790 Patch Thanks, looks good. r=me 546349 4 kbr 2012-01-31 12:13:40 -0800 I'm assuming you wanted this submitted to the commit queue. Please mark patches cq? for this in the future. 546358 5 ehsan 2012-01-31 12:20:25 -0800 (In reply to comment #4) > I'm assuming you wanted this submitted to the commit queue. Please mark patches cq? for this in the future. Sure. This is my first patch to webkit, and I don't know a lot about the workflow here. :-) 546545 6 124790 webkit.review.bot 2012-01-31 15:11:27 -0800 Comment on attachment 124790 Patch Clearing flags on attachment: 124790 Committed r106404: <http://trac.webkit.org/changeset/106404> 546546 7 webkit.review.bot 2012-01-31 15:11:31 -0800 All reviewed patches have been landed. Closing bug. 124790 2012-01-31 11:59:18 -0800 2012-01-31 15:11:27 -0800 Patch bug-77462-20120131145916.patch text/plain 1782 ehsan U3VidmVyc2lvbiBSZXZpc2lvbjogMTA2MzczCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOWU4ZTc0ZjE2NTAxZDA2N2UxNzE4YzM1ZGExOTVhMWQx MDQ3NGZkYS4uYzBlNDZmYWVmYmRhNGQ1NWQyNjU1N2E2NzIxZjdhYjMxNDZhODViYyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0 IEBACisyMDEyLTAxLTMxICBFaHNhbiBBa2hnYXJpICA8ZWhzYW4uYWtoZ2FyaUBnbWFpbC5jb20+ CisKKyAgICAgICAgRml4IHRoZSB1cGRhdGVfd2ViZ2xfY29uZm9ybWFuY2VfdGVzdHMucHkgc2Ny aXB0IGluIG9yZGVyIHRvIGVuYWJsZSBpdAorICAgICAgICB0byBkZXRlY3QgdGhlIFNDTSBiZWlu ZyB1c2VkIGNvcnJlY3RseS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTc3NDYyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3RvX2JlX21vdmVkL3VwZGF0ZV93ZWJnbF9jb25m b3JtYW5jZV90ZXN0cy5weToKKyAgICAgICAgKGRlZmF1bHRfb3V0X2Rpcik6CisKIDIwMTItMDEt MzEgIEFudG9pbmUgTGFib3VyICA8cGltYW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIE1lcmdl IFdlYkdyYXBoaWNzQ29udGV4dDNEIGNyZWF0aW9uIGFuZCBpbml0aWFsaXphdGlvbiwgYW5kIG1v dmUgaXQgdG8KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9fYmVfbW92ZWQv dXBkYXRlX3dlYmdsX2NvbmZvcm1hbmNlX3Rlc3RzLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS90b19iZV9tb3ZlZC91cGRhdGVfd2ViZ2xfY29uZm9ybWFuY2VfdGVzdHMucHkKaW5kZXggMDFm ZmZkZWU5YjZhMmZkMGM0MzNlZDU0OThiY2EwZTdkMmFmN2NhNC4uMTE5Njk4MGIyN2RjMGYzMzc1 NjliZWIxOTFjNWJjOTYzMTNkMjIyMiAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS90b19iZV9tb3ZlZC91cGRhdGVfd2ViZ2xfY29uZm9ybWFuY2VfdGVzdHMucHkKKysrIGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS90b19iZV9tb3ZlZC91cGRhdGVfd2ViZ2xfY29uZm9ybWFuY2Vf dGVzdHMucHkKQEAgLTMyLDYgKzMyLDggQEAgaW1wb3J0IG9zCiBpbXBvcnQgcmUKIGltcG9ydCBz eXMKIGZyb20gd2Via2l0cHkuY29tbW9uLmNoZWNrb3V0IGltcG9ydCBzY20KK2Zyb20gd2Via2l0 cHkuY29tbW9uLnN5c3RlbS5maWxlc3lzdGVtIGltcG9ydCBGaWxlU3lzdGVtCitmcm9tIHdlYmtp dHB5LmNvbW1vbi5zeXN0ZW0uZXhlY3V0aXZlIGltcG9ydCBFeGVjdXRpdmUKIAogCiBfbG9nID0g bG9nZ2luZy5nZXRMb2dnZXIoX19uYW1lX18pCkBAIC05NCw3ICs5Niw4IEBAIGRlZiB1cGRhdGVf ZGlyZWN0b3J5KGluX2Rpciwgb3V0X2Rpcik6CiAKIAogZGVmIGRlZmF1bHRfb3V0X2RpcigpOgot ICAgIGN1cnJlbnRfc2NtID0gc2NtLmRldGVjdF9zY21fc3lzdGVtKG9zLnBhdGguZGlybmFtZShz eXMuYXJndlswXSkpCisgICAgZGV0ZWN0b3IgPSBzY20uU0NNRGV0ZWN0b3IoRmlsZVN5c3RlbSgp LCBFeGVjdXRpdmUoKSkKKyAgICBjdXJyZW50X3NjbSA9IGRldGVjdG9yLmRldGVjdF9zY21fc3lz dGVtKG9zLnBhdGguZGlybmFtZShzeXMuYXJndlswXSkpCiAgICAgaWYgbm90IGN1cnJlbnRfc2Nt OgogICAgICAgICByZXR1cm4gb3MuZ2V0Y3dkKCkKICAgICByb290X2RpciA9IGN1cnJlbnRfc2Nt LmNoZWNrb3V0X3Jvb3QK