Bug 112732 – svn-apply has trouble applying a patch that adds a Windows newline to EOF

• Status: RESOLVED
• Resolution: FIXED
• Component: Tools / Tests

[Daniel Bates]

When using svn-apply to applying attachment 193158 [details] (bug 112306) on my Mac with an SVN checkout at r145854, svn-apply failed with the following output:

dbates:WebKit dbates$ Tools/Scripts/svn-apply /Users/dbates/Desktop/bug-112306-20130314112306.patch.txt 
Parsed 20 diffs from patch file(s).
patching file LayoutTests/ChangeLog
Hunk #1 succeeded at 1 with fuzz 3.
patching file LayoutTests/editing/inserting/insert-text-into-empty-frameset-crash.html
patching file LayoutTests/editing/style/apply-style-crash.html
patching file LayoutTests/fast/block/float/float-originating-line-deleted-crash.html
Hunk #2 FAILED at 11.
1 out of 2 hunks FAILED -- saving rejects to file LayoutTests/fast/block/float/float-originating-line-deleted-crash.html.rej
Calling "patch -p0" for file "LayoutTests/fast/block/float/float-originating-line-deleted-crash.html" returned status 1.  Pass --force to ignore patch failures.

[Daniel Bates]

Created attachment 193896 [details]
Patch and unit tests

[James Robinson]

Thanks for the patch!  Unfortunately I don't know enough about perl or patch to be able to review this.

[WebKit Review Bot]

Attachment 193896 [details] did not pass style-queue:

Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Tools/ChangeLog', u'Tools/Scripts/VCSUtils.pm', u'Tools/Scripts/webkitperl/VCSUtils_unittest/parseDiffWithMockFiles.pl']" exit_code: 1
Tools/Scripts/webkitperl/VCSUtils_unittest/parseDiffWithMockFiles.pl:181:  Line contains tab character.  [whitespace/tab] [5]
Tools/Scripts/webkitperl/VCSUtils_unittest/parseDiffWithMockFiles.pl:182:  Line contains tab character.  [whitespace/tab] [5]
Tools/Scripts/webkitperl/VCSUtils_unittest/parseDiffWithMockFiles.pl:197:  Line contains tab character.  [whitespace/tab] [5]
Tools/Scripts/webkitperl/VCSUtils_unittest/parseDiffWithMockFiles.pl:198:  Line contains tab character.  [whitespace/tab] [5]
Tools/Scripts/webkitperl/VCSUtils_unittest/parseDiffWithMockFiles.pl:221:  Line contains tab character.  [whitespace/tab] [5]
Tools/Scripts/webkitperl/VCSUtils_unittest/parseDiffWithMockFiles.pl:222:  Line contains tab character.  [whitespace/tab] [5]
Tools/Scripts/webkitperl/VCSUtils_unittest/parseDiffWithMockFiles.pl:232:  Line contains tab character.  [whitespace/tab] [5]
Tools/Scripts/webkitperl/VCSUtils_unittest/parseDiffWithMockFiles.pl:233:  Line contains tab character.  [whitespace/tab] [5]
Total errors found: 8 in 3 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Daniel Bates]

(In reply to comment #3)
> Attachment 193896 [details] did not pass style-queue:
> 
> Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Tools/ChangeLog', u'Tools/Scripts/VCSUtils.pm', u'Tools/Scripts/webkitperl/VCSUtils_unittest/parseDiffWithMockFiles.pl']" exit_code: 1
> Tools/Scripts/webkitperl/VCSUtils_unittest/parseDiffWithMockFiles.pl:181:  Line contains tab character.  [whitespace/tab] [5]
> [...]
> Tools/Scripts/webkitperl/VCSUtils_unittest/parseDiffWithMockFiles.pl:233:  Line contains tab character.  [whitespace/tab] [5]
> Total errors found: 8 in 3 files
> 
> 
> If any of these errors are false positives, please file a bug against check-webkit-style.

These tabs are intentional as the unit tests contain diff snippets that are representative of actual diffs.

[Eric Seidel (no email)]

Comment on attachment 193896 [details]
Patch and unit tests

Seems reasonable.  Darin Adler is probably your best reviewer here.

[Daniel Bates]

CC'ing Darin Adler so that he can see this patch go by per Eric Seidel's remark in comment 5.

[Daniel Bates]

Committed r146249: <http://trac.webkit.org/changeset/146249>