[Webkit-unassigned] [Bug 216330] New: WPT exporter should use --3way when patch is from git

[bugzilla-daemon at webkit.org]

https://bugs.webkit.org/show_bug.cgi?id=216330

            Bug ID: 216330
           Summary: WPT exporter should use --3way when patch is from git
           Product: WebKit
           Version: WebKit Nightly Build
          Hardware: Unspecified
                OS: Unspecified
            Status: NEW
          Severity: Normal
          Priority: P2
         Component: Tools / Tests
          Assignee: webkit-unassigned at lists.webkit.org
          Reporter: gsnedders at apple.com

When we're running on a git checkout of WebKit, the WPT exporter just gets its patch from `git diff`. This includes blob IDs, which means we can then use `git apply --3way` when applying the patch to the WPT tree, which has a better chance of succeeding (unless the file got modified during import) as the blob the patch applies to is recorded and therefore git doesn't just blindly try to apply it to the tip-of-tree of WPT, but can use its merge machinery.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.webkit.org/pipermail/webkit-unassigned/attachments/20200909/da951230/attachment.htm>