184341 2018-04-05 15:45:06 -0700 [test262] Mark line-terminator-normalisation-CR.js as a binary file. 2018-04-06 09:26:29 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED INVALID InRadar P2 Normal --- 184266 1 ross.kirsling ross.kirsling ap commit-queue saam valerie webkit-bug-importer ysuzuki oldest_to_newest 1412197 0 ross.kirsling 2018-04-05 15:45:06 -0700 [test262] Mark line-terminator-normalisation-CR.js as a binary file. 1412198 1 337307 ross.kirsling 2018-04-05 15:50:01 -0700 Created attachment 337307 Patch 1412253 2 337307 ysuzuki 2018-04-05 19:13:03 -0700 Comment on attachment 337307 Patch r=me 1412265 3 337307 commit-queue 2018-04-05 19:38:46 -0700 Comment on attachment 337307 Patch Clearing flags on attachment: 337307 Committed r230320: <https://trac.webkit.org/changeset/230320> 1412266 4 commit-queue 2018-04-05 19:38:47 -0700 All reviewed patches have been landed. Closing bug. 1412267 5 webkit-bug-importer 2018-04-05 19:39:19 -0700 <rdar://problem/39228555> 1412268 6 ap 2018-04-05 19:46:54 -0700 Does this need to be fixed for svn too? One can directly specify cr line endings for svn, no need to revert to binary. 1412284 7 ysuzuki 2018-04-05 20:24:07 -0700 (In reply to Alexey Proskuryakov from comment #6) > Does this need to be fixed for svn too? One can directly specify cr line > endings for svn, no need to revert to binary. I checked .gitattributes change like https://bugs.webkit.org/show_bug.cgi?id=58315 and I cannot find any SVN property changes in that patch. But specifying `svn propset svn:mime-type application/octet-stream file` would be nice. Do we have the way to do the above thing in git WebKit tree? 1412285 8 ysuzuki 2018-04-05 20:31:14 -0700 (In reply to Yusuke Suzuki from comment #7) > (In reply to Alexey Proskuryakov from comment #6) > > Does this need to be fixed for svn too? One can directly specify cr line > > endings for svn, no need to revert to binary. > > I checked .gitattributes change like > https://bugs.webkit.org/show_bug.cgi?id=58315 and I cannot find any SVN > property changes in that patch. > But specifying `svn propset svn:mime-type application/octet-stream file` > would be nice. Do we have the way to do the above thing in git WebKit tree? Hmmmm, git-svn do not have the way to set prop............. https://stackoverflow.com/questions/1271449/how-to-set-subversion-properties-with-git-svn 1412289 9 ysuzuki 2018-04-05 20:39:56 -0700 BTW, I'm now attempting to apply https://bugs.webkit.org/show_bug.cgi?id=184266 to my git-managed WebKit tree by Tools/Scripts/webkit-patch apply-from-bug. If this patch is effective, we will get it applied. 1412291 10 ross.kirsling 2018-04-05 20:51:29 -0700 (In reply to Alexey Proskuryakov from comment #6) > Does this need to be fixed for svn too? One can directly specify cr line > endings for svn, no need to revert to binary. Ah yes, seems like we ought to do something like this for good measure: https://trac.webkit.org/changeset/199564/webkit Unfortunately though, since `svn-apply` can't handle files with CR line endings (due to performing its own line ending normalization based on the first line ending it encounters in the patch), I think marking it as binary is the only way to ensure its contents don't appear in the patch file? (In reply to Yusuke Suzuki from comment #9) > BTW, I'm now attempting to apply > https://bugs.webkit.org/show_bug.cgi?id=184266 to my git-managed WebKit tree > by Tools/Scripts/webkit-patch apply-from-bug. If this patch is effective, we > will get it applied. Note that the existing patch on that bug won't work -- we need a new diff of the same changes, which will then treat this file as binary. 1412301 11 ap 2018-04-05 21:29:17 -0700 I don't think we ever needed to use binary for text files with svn, adding svn:eol-style should just work I hope. 1412318 12 ross.kirsling 2018-04-05 23:23:52 -0700 Oh geez. I just realized that the problem isn't svn-apply's fault at all -- it's that the offending file ends in CRLF. Just confirmed that the file can be patched normally if this is corrected, so I think we can just rollout the change in this bug. 1412326 13 ross.kirsling 2018-04-05 23:56:52 -0700 Reverted r230320 for reason: Revert Committed r230329: <https://trac.webkit.org/changeset/230329> 1412379 14 ap 2018-04-06 09:26:29 -0700 I added the svn property in r230333 nonetheless. 337307 2018-04-05 15:50:01 -0700 2018-04-05 19:38:46 -0700 Patch bug-184341-20180405155000.patch text/plain 1110 ross.kirsling U3VidmVyc2lvbiBSZXZpc2lvbjogMjMwMzEzCmRpZmYgLS1naXQgYS9KU1Rlc3RzLy5naXRhdHRy aWJ1dGVzIGIvSlNUZXN0cy8uZ2l0YXR0cmlidXRlcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRl eCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5mOTZhMWNiYjM3MTU5 ZjM0NzE3NGVhZjM3ZWMwNzExOGI1YjMyODIxCi0tLSAvZGV2L251bGwKKysrIGIvSlNUZXN0cy8u Z2l0YXR0cmlidXRlcwpAQCAtMCwwICsxIEBACit0ZXN0MjYyL3Rlc3QvYnVpbHQtaW5zL0Z1bmN0 aW9uL3Byb3RvdHlwZS90b1N0cmluZy9saW5lLXRlcm1pbmF0b3Itbm9ybWFsaXNhdGlvbi1DUi5q cyBiaW5hcnkKZGlmZiAtLWdpdCBhL0pTVGVzdHMvQ2hhbmdlTG9nIGIvSlNUZXN0cy9DaGFuZ2VM b2cKaW5kZXggOTA5OGJiMzQxZDVjYzNkMDNiZWRlNWFmYmNjOTBhYjU5MjVhMGZjNy4uYzhiZDU5 NTg4NzBjODliODlkMGUwODNjYWRmYTZjNzUxNmU0Zjg0NiAxMDA2NDQKLS0tIGEvSlNUZXN0cy9D aGFuZ2VMb2cKKysrIGIvSlNUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxOC0w NC0wNSAgUm9zcyBLaXJzbGluZyAgPHJvc3Mua2lyc2xpbmdAc29ueS5jb20+CisKKyAgICAgICAg W3Rlc3QyNjJdIE1hcmsgbGluZS10ZXJtaW5hdG9yLW5vcm1hbGlzYXRpb24tQ1IuanMgYXMgYSBi aW5hcnkgZmlsZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE4NDM0MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFRoaXMgdGVzdCBpcyBhbGwgYWJvdXQgQ1IgbGluZSBlbmRpbmdzLCBidXQgYHN2bi1hcHBs eWAgY2FuJ3QgZGVhbCB3aXRoIHRoZW0uCisgICAgICAgIFRyZWF0aW5nIHRoZSBmaWxlIGFzIGJp bmFyeSBlbnN1cmVzIHRoYXQgaXRzIGNvbnRlbnRzIG5ldmVyIGFyZSBuZXZlciBzaG93biBpbiBh IGRpZmYuCisKKyAgICAgICAgKiAuZ2l0YXR0cmlidXRlczogQWRkZWQuCisKIDIwMTgtMDQtMDUg IFJvYmluIE1vcmlzc2V0ICA8cm1vcmlzc2V0QGFwcGxlLmNvbT4KIAogICAgICAgICBGaXggdGVz dGNhc2UgKG1pc3NpbmcgdHJ5L2NhdGNoKS4K