Changeset 48236 in webkit


Ignore:
Timestamp:
Sep 9, 2009 4:41:43 PM (15 years ago)
Author:
eric@webkit.org
Message:

2009-09-09 Cameron McCormack <cam@mcc.id.au>

Reviewed by Eric Seidel.

svn-apply doesn't handle changes to files copied to new directories properly
https://bugs.webkit.org/show_bug.cgi?id=29059

  • Scripts/svn-apply: Don't treat "--- revision 0" patches as being additions if we know that we've just copied a file to this name.
Location:
trunk/WebKitTools
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebKitTools/ChangeLog

    r48230 r48236  
     12009-09-09  Cameron McCormack  <cam@mcc.id.au>
     2
     3        Reviewed by Eric Seidel.
     4
     5        svn-apply doesn't handle changes to files copied to new directories properly
     6        https://bugs.webkit.org/show_bug.cgi?id=29059
     7
     8        * Scripts/svn-apply: Don't treat "--- revision 0" patches as being
     9        additions if we know that we've just copied a file to this name.
     10
    1112009-09-09  Eric Seidel  <eric@webkit.org>
    212
  • trunk/WebKitTools/Scripts/svn-apply

    r48027 r48236  
    381381    my $isBinary = 0;
    382382
    383     $addition = 1 if ($patch =~ /\n--- .+\(revision 0\)\r?\n/ || $patch =~ /\n@@ -0,0 .* @@/);
     383    $addition = 1 if ($patch =~ /\n--- .+\(revision 0\)\r?\n/ || $patch =~ /\n@@ -0,0 .* @@/) && !exists($copiedFiles{$fullPath});
    384384    $deletion = 1 if $patch =~ /\n@@ .* \+0,0 @@/;
    385385    $isBinary = 1 if $patch =~ /\nCannot display: file marked as a binary type\./;
Note: See TracChangeset for help on using the changeset viewer.