Attachment 359970 Details for Bug 193746 – Patch

[patch] Patch

bug-193746-20190123182556.patch (text/plain), 1.45 KB, created by Michael Catanzaro on 2019-01-23 16:25:57 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Catanzaro

Created: 2019-01-23 16:25:57 PST

Size: 1.45 KB

patch

obsolete

>Subversion Revision: 240364
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 341a01ecbb16d3fdc90ae6e1bff43a888ad9939b..a56fcdeb57c9d5cd6f8c7a45812360404ab3933c 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,16 @@
>+2019-01-23  Michael Catanzaro  <mcatanzaro@igalia.com>
>+
>+        test_exporter.py: webkitpy.common.system.executive.ScriptError from create_branch_with_patch
>+        https://bugs.webkit.org/show_bug.cgi?id=193746
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        It calls 'git apply --index --abort', but --abort is not a valid argument to 'git apply',
>+        so we'd best just not call it.
>+
>+        * Scripts/webkitpy/w3c/test_exporter.py:
>+        (WebPlatformTestExporter.create_branch_with_patch):
>+
> 2019-01-23  Chris Dumez  <cdumez@apple.com>
> 
>         Deprecate API to limit the maximum number of WebProcesses
>diff --git a/Tools/Scripts/webkitpy/w3c/test_exporter.py b/Tools/Scripts/webkitpy/w3c/test_exporter.py
>index 7290311ed04dc980748d8d1e448a112309880ef1..0abcee7ccd1e2a11801d00a8cd26c0d3e104d3b8 100644
>--- a/Tools/Scripts/webkitpy/w3c/test_exporter.py
>+++ b/Tools/Scripts/webkitpy/w3c/test_exporter.py
>@@ -293,7 +293,6 @@ class WebPlatformTestExporter(object):
>             self._git.apply_mail_patch([patch])
>         except Exception as e:
>             _log.warning(e)
>-            self._git.apply_mail_patch(['--abort'])
>             return False
>         self._git.commit(['-a', '-m', self._commit_message])
>         return True

Actions: View | Formatted Diff | Diff

Attachments on bug 193746: 359970