Commit 2e4fb03f authored by ddkilzer@apple.com's avatar ddkilzer@apple.com

Bug 21850: svn-apply and svn-unapply should preserve patch line endings

        <https://bugs.webkit.org/show_bug.cgi?id=21850>

        Reviewed by Adam Roben.

        * Scripts/svn-apply: Save end-of-line characters when stripping them
        off each line of a patch so that they may be restored after
        processing the line.
        * Scripts/svn-unapply: Ditto.



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@37847 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 22ade9b6
2008-10-24 David Kilzer <ddkilzer@apple.com>
Bug 21850: svn-apply and svn-unapply should preserve patch line endings
<https://bugs.webkit.org/show_bug.cgi?id=21850>
Reviewed by Adam Roben.
* Scripts/svn-apply: Save end-of-line characters when stripping them
off each line of a patch so that they may be restored after
processing the line.
* Scripts/svn-unapply: Ditto.
2008-10-23 David Kilzer <ddkilzer@apple.com>
Bug 21832: Fix scripts using 'new File::Temp' for Perl 5.10
......
......@@ -107,8 +107,8 @@ my $filter;
my $indexPath;
my $patch;
while (<>) {
s/\r//g;
chomp;
s/([\n\r]+)$//mg;
my $eol = $1;
if (!defined($indexPath) && m#^diff --git a/#) {
$filter = \&gitdiff2svndiff;
}
......@@ -140,7 +140,7 @@ while (<>) {
}
}
$patch .= $_;
$patch .= "\n";
$patch .= $eol;
}
if ($patch && !$copiedFromPath) {
......
......@@ -88,8 +88,8 @@ my $filter;
my $indexPath;
my $patch;
while (<>) {
s/\r//g;
chomp;
s/([\n\r]+)$//mg;
my $eol = $1;
if (!defined($indexPath) && m#^diff --git a/#) {
$filter = \&gitdiff2svndiff;
}
......@@ -117,7 +117,7 @@ while (<>) {
}
}
$patch .= $_;
$patch .= "\n";
$patch .= $eol;
}
if ($patch) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment