Bug 150650

Summary: svn-apply should handle unified diffs
Product: WebKit Reporter: Dana Burkart <dburkart>
Component: Tools / TestsAssignee: Dana Burkart <dburkart>
Status: RESOLVED FIXED    
Severity: Normal CC: commit-queue, dbates, dburkart, ddkilzer, lforschler
Priority: P2    
Version: WebKit Nightly Build   
Hardware: Unspecified   
OS: Unspecified   
Attachments:
Description Flags
Patch darin: review+

Dana Burkart
Reported 2015-10-28 17:46:44 PDT
When trying to apply a unified-style diff with svn-apply, I get this mysterious error: Parsed 0 diffs from patch file(s). No diff found. at /path/to/svn-apply line 126. I suspect that this might be failing due to a slightly different diff heading style than what svn-apply expects. In particular, diff chunks generated by `diff -u` generate headings which immediately start with: ---- a/b/c/d ++++ a/b/c/d Instead of something like: diff --git a/b/c/d index 1234..56787 100644 ---- a/b/c/d ++++ a/b/c/d
Attachments
Patch (13.14 KB, patch)
2015-10-30 12:30 PDT, Dana Burkart 		darin: review+
DetailsFormatted DiffDiff
View All Add attachment proposed patch, testcase, etc.
Dana Burkart
Comment 1 2015-10-30 12:30:18 PDT
Created attachment 264408 [details] Patch Adds smarts to VCSUtils.pm to be able to apply standard unified patches produced by `diff u`.
Dana Burkart
Comment 2 2015-11-02 10:48:04 PST
Committed r191900.
Note You need to log in before you can comment on or make changes to this bug.