Bug 216330 - WPT exporter should use --3way when patch is from git
Summary: WPT exporter should use --3way when patch is from git
Status: RESOLVED DUPLICATE of bug 238446
Alias: None
Product: WebKit
Classification: Unclassified
Component: Tools / Tests (show other bugs)
Version: WebKit Nightly Build
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Nobody
URL:
Keywords: InRadar
Depends on: 238446
Blocks:
  Show dependency treegraph
 
Reported: 2020-09-09 15:37 PDT by Sam Sneddon [:gsnedders]
Modified: 2022-03-28 09:29 PDT (History)
4 users (show)

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Sam Sneddon [:gsnedders] 2020-09-09 15:37:48 PDT
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.
Comment 1 Radar WebKit Bug Importer 2020-09-16 15:38:14 PDT
<rdar://problem/69019391>
Comment 2 Noam Rosenthal 2022-03-28 06:09:57 PDT
https://bugs.webkit.org/show_bug.cgi?id=238446 resolves
Comment 3 Tim Nguyen (:ntim) 2022-03-28 09:29:40 PDT

*** This bug has been marked as a duplicate of bug 238446 ***