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

[bugzilla-daemon at webkit.org]

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


Daniel Bates <dbates at webkit.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
            Summary|svn-apply eats some         |REGRESSION (r86515):
                   |trailing newline            |svn-apply ignores diffs
                   |                            |that omit line count in
                   |                            |chunk range
           Platform|Unspecified                 |All
         OS/Version|Linux                       |All
           Keywords|                            |Regression




--- Comment #3 from Daniel Bates <dbates at webkit.org>  2011-05-20 11:40:24 PST ---
Consider the following diff D from the patch attachment 94027:

[[
diff --git a/LayoutTests/canvas/philip/tests/2d.composite.uncovered.pattern.source-in-expected.txt b/LayoutTests/canvas/philip/tests/2d.composite.uncovered.pattern.source-in-expected.txt
index 863339f..db418b2 100644
--- a/LayoutTests/canvas/philip/tests/2d.composite.uncovered.pattern.source-in-expected.txt
+++ b/LayoutTests/canvas/philip/tests/2d.composite.uncovered.pattern.source-in-expected.txt
@@ -1 +1,2 @@
 Passed
+
]]

In particular, the chunk range line "@@ -1 +1,2 @@", call this C, omits a line count for the original file.
Notice, the chunk range regular expression we use is: ^\@\@ -(\d+),(\d+) \+\d+,(\d+) \@\@ (http://trac.webkit.org/browser/trunk/Tools/Scripts/VCSUtils.pm?rev=86515#L101). So, we don't match C. 

With the landing of changeset 86515 <http://trac.webkit.org/changeset/86515> we only pass a diff to patch(1) if it contains at least one valid chunk range line (since patch(1) can't handle a diff without one). We don't pass D to patch(1) since it doesn't contain a valid chunk range line; => we ignore D.

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