[test262] Mark line-terminator-normalisation-CR.js as a binary file.
Created attachment 337307 [details] Patch
Comment on attachment 337307 [details] Patch r=me
Comment on attachment 337307 [details] Patch Clearing flags on attachment: 337307 Committed r230320: <https://trac.webkit.org/changeset/230320>
All reviewed patches have been landed. Closing bug.
<rdar://problem/39228555>
Does this need to be fixed for svn too? One can directly specify cr line endings for svn, no need to revert to binary.
(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?
(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
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.
(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.
I don't think we ever needed to use binary for text files with svn, adding svn:eol-style should just work I hope.
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.
Reverted r230320 for reason: Revert Committed r230329: <https://trac.webkit.org/changeset/230329>
I added the svn property in r230333 nonetheless.