[Webkit-unassigned] [Bug 232064] New: [ANGLE] Revise update-angle script with option to take upstream ANGLE

[bugzilla-daemon at webkit.org]

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

            Bug ID: 232064
           Summary: [ANGLE] Revise update-angle script with option to take
                    upstream ANGLE
           Product: WebKit
           Version: WebKit Nightly Build
          Hardware: Unspecified
                OS: Unspecified
            Status: NEW
          Severity: Normal
          Priority: P2
         Component: ANGLE
          Assignee: webkit-unassigned at lists.webkit.org
          Reporter: kbr at google.com
                CC: dino at apple.com, kbr at google.com, kkinnunen at apple.com

After several months of collaboration, the WebKit and ANGLE teams are preparing to take a large update of the upstream ANGLE repository back down into WebKit.

Attempting to do this with the current Tools/Scripts/update-angle script will not be fruitful. A year of development has just been resolved into upstream ANGLE, and if we attempt to merge upstream ANGLE onto WebKit's commit history, there will be a huge number of merge conflicts.

Tools/Scripts/update-angle needs an option to take upstream ANGLE as the source of truth. Care needs to be taken to avoid losing the changes made by Apple at the point in time when the last ANGLE update was taken. At that point, Source/ThirdParty/ANGLE/changes.diff should be able to be regenerated again, and can once again be considered transient.

-- 
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/20211021/0bf314e9/attachment.htm>