svn-apply failed to apply the attachment #140425 [details] (from bug #85739) using git: <http://queues.webkit.org/results/12507819> I was able to apply the patch using SVN, but did get some SVN warning messages: [[ copper:WebKit dbates$ Tools/Scripts/svn-apply /Users/dbates/Desktop/85739_r1.diff.txt Parsed 9 diffs from patch file(s). patching file ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file Tools/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file Tools/Scripts/build-webkit Hunk #1 succeeded at 552 (offset 307 lines). patching file Tools/Scripts/copy-webkitlibraries-to-product-directory A Tools/Scripts/copy-webkitlibraries-to-product-directory property 'svn:executable' set on 'Tools/Scripts/copy-webkitlibraries-to-product-directory' A WebKit.xcworkspace patching file WebKit.xcworkspace/contents.xcworkspacedata A WebKit.xcworkspace/contents.xcworkspacedata A WebKit.xcworkspace/xcshareddata patching file WebKit.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings A WebKit.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings A WebKit.xcworkspace/xcshareddata/xcschemes patching file 'WebKit.xcworkspace/xcshareddata/xcschemes/All Source (target WebProcess).xcscheme Source (target WebProcess).xcscheme' svn: warning: 'WebKit.xcworkspace/xcshareddata/xcschemes/All Source (target WebProcess).xcscheme' not found patching file 'WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme Source.xcscheme' svn: warning: 'WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme' not found patching file 'WebKit.xcworkspace/xcshareddata/xcschemes/All Tools.xcscheme Tools.xcscheme' svn: warning: 'WebKit.xcworkspace/xcshareddata/xcschemes/All Tools.xcscheme' not found ]]
Attachment #142343 [details] (bug #86138) also fails to apply using svn-apply with a Git checkout. I was able to apply it using svn-apply and a SVN checkout.
(In reply to comment #1) > Attachment #142343 [details] (bug #86138) also fails to apply using svn-apply with a Git checkout. > > I was able to apply it using svn-apply and a SVN checkout. The svn-apply failure with respect to attachment 142343 [details] is a separate issue. See bug #86973.
Created attachment 142921 [details] Patch and unit tests
Attachment 142921 [details] did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Tools/ChangeLog', u'Tools/Scripts/VCSUtils..." exit_code: 1 Tools/Scripts/webkitperl/VCSUtils_unittest/parseSvnDiffHeader.pl:97: Line contains tab character. [whitespace/tab] [5] Tools/Scripts/webkitperl/VCSUtils_unittest/parseSvnDiffHeader.pl:98: Line contains tab character. [whitespace/tab] [5] Tools/Scripts/webkitperl/VCSUtils_unittest/parseSvnDiffHeader.pl:107: Line contains tab character. [whitespace/tab] [5] Tools/Scripts/webkitperl/VCSUtils_unittest/parseSvnDiffHeader.pl:108: Line contains tab character. [whitespace/tab] [5] Total errors found: 4 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style.
Comment on attachment 142921 [details] Patch and unit tests You are an amazing man. Thank you.
Comment on attachment 142921 [details] Patch and unit tests Clearing flags on attachment: 142921 Committed r117715: <http://trac.webkit.org/changeset/117715>
All reviewed patches have been landed. Closing bug.