diff options
Diffstat (limited to 'WebKitTools/Scripts/svn-unapply')
| -rwxr-xr-x | WebKitTools/Scripts/svn-unapply | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/WebKitTools/Scripts/svn-unapply b/WebKitTools/Scripts/svn-unapply index 2ef7249..e502560 100755 --- a/WebKitTools/Scripts/svn-unapply +++ b/WebKitTools/Scripts/svn-unapply @@ -149,10 +149,8 @@ sub patch($) my $deletion = 0; my $addition = 0; - # FIXME: This information should be extracted from the diff file as - # part of the parsing stage, i.e. the call to parsePatch(). - $addition = 1 if ($diffHashRef->{copiedFromPath} || $patch =~ /\n--- .+\(revision 0\)\n/ || $patch =~ /\n@@ -0,0 .* @@/); - $deletion = 1 if $patch =~ /\n@@ .* \+0,0 @@/; + $addition = 1 if ($diffHashRef->{isNew} || $diffHashRef->{copiedFromPath} || $patch =~ /\n@@ -0,0 .* @@/); + $deletion = 1 if ($diffHashRef->{isDeletion} || $patch =~ /\n@@ .* \+0,0 @@/); if (!$addition && !$deletion && !$isSvnBinary) { # Standard patch, patch tool can handle this. |