[Webkit-unassigned] [Bug 36257] New: REGRESSION: svn-apply does not handle overlapping diffs?

[bugzilla-daemon at webkit.org]

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

           Summary: REGRESSION: svn-apply does not handle overlapping
                    diffs?
           Product: WebKit
           Version: 528+ (Nightly build)
          Platform: PC
        OS/Version: Mac OS X 10.5
            Status: NEW
          Severity: Normal
          Priority: P2
         Component: Tools / Tests
        AssignedTo: webkit-unassigned at lists.webkit.org
        ReportedBy: eric at webkit.org
                CC: cjerdonek at webkit.org
            Blocks: 30683


REGRESSION: svn-apply does not handle overlapping diffs?

It appears since my initial fixes for svn-apply in
http://trac.webkit.org/changeset/50547

It's not surprising that these regressed as they're not run by default. 
However:
test-webkitpy --all
will run all tests including the (slow) scm tests.

======================================================================
FAIL: test_svn_apply (webkitpy.scm_unittest.SVNTest)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/Projects/WebKit/WebKitTools/Scripts/webkitpy/scm_unittest.py", line
406, in test_svn_apply
    self.assertEquals(read_from_path('ChangeLog'), expected_changelog_contents)
AssertionError: '2009-10-27  Eric Seidel  <eric at webkit.org>\n\n        Reviewed
by Baz Bar.\n\n        A more awesomer change yet!\n\n        *
scm_unittest.py:\n\n2009-10-26  Eric Seidel  <eric at webkit.org>\n\n       
Reviewed by NOBODY (OOPS!).\n\n        Second most awesome change ever.\n\n    
   * scm_unittest.py:\n\n2010-03-17  Eric Seidel  <eric at webkit.org>\n\n       
Reviewed by Foo Bar.\n\n        Most awesome change ever.\n\n        *
scm_unittest.py:\n' != '2010-03-17  Eric Seidel  <eric at webkit.org>\n\n       
Reviewed by Joe Cool.\n\n        Second most awesome change ever.\n\n        *
scm_unittest.py:\n\n2009-10-27  Eric Seidel  <eric at webkit.org>\n\n       
Reviewed by Baz Bar.\n\n        A more awesomer change yet!\n\n        *
scm_unittest.py:\n\n2009-10-26  Eric Seidel  <eric at webkit.org>\n\n       
Reviewed by Foo Bar.\n\n        Most awesome change ever.\n\n        *
scm_unittest.py:\n'

----------------------------------------------------------------------

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