Title: [249190] trunk/Tools
Revision
249190
Author
[email protected]
Date
2019-08-27 20:15:33 -0700 (Tue, 27 Aug 2019)

Log Message

Fix applying diffs that only change file mode
https://bugs.webkit.org/show_bug.cgi?id=201191

Patch by James Darpinian <[email protected]> on 2019-08-27
Reviewed by Daniel Bates.

* Scripts/svn-apply:
(patch): Handle case of file mode change without content change

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (249189 => 249190)


--- trunk/Tools/ChangeLog	2019-08-28 02:39:02 UTC (rev 249189)
+++ trunk/Tools/ChangeLog	2019-08-28 03:15:33 UTC (rev 249190)
@@ -1,3 +1,13 @@
+2019-08-27  James Darpinian  <[email protected]>
+
+        Fix applying diffs that only change file mode
+        https://bugs.webkit.org/show_bug.cgi?id=201191
+
+        Reviewed by Daniel Bates.
+
+        * Scripts/svn-apply:
+        (patch): Handle case of file mode change without content change
+
 2019-08-27  Aakash Jain  <[email protected]>
 
         [ews] Status bubble should be red for CANCELLED builds

Modified: trunk/Tools/Scripts/svn-apply (249189 => 249190)


--- trunk/Tools/Scripts/svn-apply	2019-08-28 02:39:02 UTC (rev 249189)
+++ trunk/Tools/Scripts/svn-apply	2019-08-28 03:15:33 UTC (rev 249190)
@@ -382,7 +382,7 @@
             open(my $FH, ">>", $fullPath) or die "Could not open \"$fullPath\" for writing: $!";
             close($FH);
             scmAdd($fullPath);
-        } else {
+        } elsif (!defined($diffHashRef->{executableBitDelta})) {
             die "Can't handle patch for \"$fullPath\".";
         }
     }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to