Changeset 83394 in webkit


Ignore:
Timestamp:
Apr 9, 2011 10:57:58 PM (13 years ago)
Author:
levin@chromium.org
Message:

svn-apply and/or patch(1) has trouble applying patches that makes changes to files with Windows line endings
https://bugs.webkit.org/show_bug.cgi?id=53625

Reviewed by Adam Barth.

  • Scripts/svn-apply: Ensure that the portions of patches

which are for vcproj/vsprops files has DOS line endings.

Location:
trunk/Tools
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Tools/ChangeLog

    r83384 r83394  
     12011-04-09  David Levin  <levin@chromium.org>
     2
     3        Reviewed by Adam Barth.
     4
     5        svn-apply and/or patch(1) has trouble applying patches that makes changes to files with Windows line endings
     6        https://bugs.webkit.org/show_bug.cgi?id=53625
     7
     8        * Scripts/svn-apply: Ensure that the portions of patches
     9        which are for vcproj/vsprops files has DOS line endings.
     10
    1112011-04-09  Dirk Pranke  <dpranke@chromium.org>
    212
  • trunk/Tools/Scripts/svn-apply

    r75235 r83394  
    332332            unlink("${fullPath}.orig") if (! $changeLogDotOrigExisted);
    333333        } else {
     334            # Ensure that patches for files with DOS line endings also have DOS line endings.
     335            if (basename($fullPath) =~ /\.vcproj$/ || basename($fullPath) =~ /\.vsprops$/) {
     336                # Convert all instances of newlines to \r\r\n. Why are there two \r's?
     337                # Think of it as escaping. Patch will convert \r\n to \n, so \r\r\n becomes \r\n.
     338                $patch =~ s/\r{0,2}\n/\r\r\n/g;
     339            }
    334340            applyPatch($patch, $fullPath) if $patch;
    335341        }
Note: See TracChangeset for help on using the changeset viewer.