|Summary:||[ANGLE] Revise update-angle script with option to take upstream ANGLE|
|Product:||WebKit||Reporter:||Kenneth Russell <kbr>|
|Severity:||Normal||CC:||dino, geofflang, gman, jonahr, kbr, kkinnunen, kpiddington, webkit-bug-importer|
|Version:||WebKit Nightly Build|
|Bug Depends on:|
Description Kenneth Russell 2021-10-20 17:57:58 PDT
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.