[Webkit-unassigned] [Bug 61162] REGRESSION (r86515): svn-apply ignores diffs that omit line count in chunk range

bugzilla-daemon at webkit.org bugzilla-daemon at webkit.org
Tue May 24 13:35:40 PDT 2011


https://bugs.webkit.org/show_bug.cgi?id=61162





--- Comment #11 from David Kilzer (ddkilzer) <ddkilzer at webkit.org>  2011-05-24 13:35:39 PST ---
(In reply to comment #8)
> The patch was created by git, but was this a transient bug in the version of git you were using Julien, or is this a slightly altered patch format that git is now using?

Dan says on IRC:

I just wanted to be clear, the patch isn't malformed. Instead, as Wikipedia remarks in the diff article "In many versions of GNU diff, each range can omit the comma and trailing value s, in which case s defaults to 1."

This can also be seen in the function that prints the unified number range print_unidiff_number_range() in <http://git.savannah.gnu.org/cgit/diffutils.git/tree/src/context.c#n275>

I tried to elaborate about this behavior in my commit message but I inadvertently wrote "GNU patch(1)" instead of "GNU diff(1)".

The source for GNU patch(1) has similar logic when generateing the .rej file. For completeness, the Wikipedia article is here: <http://en.wikipedia.org/wiki/Diff#Unified_format>.

-- 
Configure bugmail: https://bugs.webkit.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.



More information about the webkit-unassigned mailing list