Changeset 249190 in webkit

Timestamp:

Aug 27, 2019, 8:15:33 PM (7 years ago)

Author:

commit-queue@webkit.org

Message:

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

Patch by James Darpinian <​jdarpinian@google.com> on 2019-08-27
Reviewed by Daniel Bates.

• Scripts/svn-apply:

(patch): Handle case of file mode change without content change

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/svn-apply (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2019-08-27  James Darpinian  <jdarpinian@google.com>
+
+        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  <aakash_jain@apple.com>
 

trunk/Tools/Scripts/svn-apply

@@ -383 +383 @@
             close($FH);
             scmAdd($fullPath);
-        } else {
+        } elsif (!defined($diffHashRef->{executableBitDelta})) {
             die "Can't handle patch for \"$fullPath\".";
         }