Bug 263769

update-angle script does not work cleanly, angle repository submodules causes problems


1) .gitmodules file is not updated by the script, needs

cp ~/angle/.gitmodules Source/ThirdParty/ANGLE/.gitmodules

and update-angle --generate-changes


2) Some of the ANGLE submodules complain that one part has deleted the dir and one part has modified the dir.


Script says
Rebasing WebKit's local changes on latest ANGLE main.
CONFLICT (modify/delete): build deleted in b180a9e687 (Update ANGLE to 2023-10-25 (368ddf22e4d4eb5a54a5d2f5d424c1f6b5bf27bd)) and modified in HEAD.  Version HEAD of build left in tree.
CONFLICT (modify/delete): buildtools deleted in b180a9e687 (Update ANGLE to 2023-10-25 (368ddf22e4d4eb5a54a5d2f5d424c1f6b5bf27bd)) and modified in HEAD.  Version HEAD of buildtools left in tree.
Auto-merging src/libANGLE/renderer/metal/DisplayMtl.mm
Auto-merging src/libANGLE/renderer/metal/mtl_render_utils.mm
Auto-merging src/libANGLE/renderer/metal/mtl_utils.mm
CONFLICT (modify/delete): testing deleted in b180a9e687 (Update ANGLE to 2023-10-25 (368ddf22e4d4eb5a54a5d2f5d424c1f6b5bf27bd)) and modified in HEAD.  Version HEAD of testing left in tree.
CONFLICT (modify/delete): third_party/abseil-cpp deleted in b180a9e687 (Update ANGLE to 2023-10-25 (368ddf22e4d4eb5a54a5d2f5d424c1f6b5bf27bd)) and modified in HEAD.  Version HEAD of third_party/abseil-cpp left in tree.
CONFLICT (modify/delete): third_party/android_deps deleted in b180a9e687 (Update ANGLE to 2023-10-25 (368ddf22e4d4eb5a54a5d2f5d424c1f6b5bf27bd)) and modified in HEAD.  Version HEAD of third_party/android_deps left in tree.
CONFLICT (modify/delete): third_party/catapult deleted in b180a9e687 (Update ANGLE to 2023-10-25 (368ddf22e4d4eb5a54a5d2f5d424c1f6b5bf27bd)) and modified in HEAD.  Version HEAD of third_party/catapult left in tree.
CONFLICT (modify/delete): third_party/depot_tools deleted in b180a9e687 (Update ANGLE to 2023-10-25 (368ddf22e4d4eb5a54a5d2f5d424c1f6b5bf27bd)) and modified in HEAD.  Version HEAD of third_party/depot_tools left in tree.
CONFLICT (modify/delete): third_party/libc++/src deleted in b180a9e687 (Update ANGLE to 2023-10-25 (368ddf22e4d4eb5a54a5d2f5d424c1f6b5bf27bd)) and modified in HEAD.  Version HEAD of third_party/libc++/src left in tree.
CONFLICT (modify/delete): third_party/libc++abi/src deleted in b180a9e687 (Update ANGLE to 2023-10-25 (368ddf22e4d4eb5a54a5d2f5d424c1f6b5bf27bd)) and modified in HEAD.  Version HEAD of third_party/libc++abi/src left in tree.
CONFLICT (file/directory): directory in the way of third_party/zlib from HEAD; moving it to third_party/zlib~HEAD instead.
CONFLICT (modify/delete): tools/android deleted in b180a9e687 (Update ANGLE to 2023-10-25 (368ddf22e4d4eb5a54a5d2f5d424c1f6b5bf27bd)) and modified in HEAD.  Version HEAD of tools/android left in tree.
CONFLICT (modify/delete): tools/mb deleted in b180a9e687 (Update ANGLE to 2023-10-25 (368ddf22e4d4eb5a54a5d2f5d424c1f6b5bf27bd)) and modified in HEAD.  Version HEAD of tools/mb left in tree.
CONFLICT (modify/delete): tools/perf deleted in b180a9e687 (Update ANGLE to 2023-10-25 (368ddf22e4d4eb5a54a5d2f5d424c1f6b5bf27bd)) and modified in HEAD.  Version HEAD of tools/perf left in tree.
error: could not apply b180a9e687... Update ANGLE to 2023-10-25 (368ddf22e4d4eb5a54a5d2f5d424c1f6b5bf27bd)
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply b180a9e687... Update ANGLE to 2023-10-25 (368ddf22e4d4eb5a54a5d2f5d424c1f6b5bf27bd) https://bugs.webkit.org/show_bug.cgi?id=263639 rdar://problem/117461678

There is now a temporary git repo in Source/ThirdParty/ANGLE with a
rebase in progress. You must resolve the merge conflict and continue
the rebase. Make sure to do this in the temporary
Source/ThirdParty/ANGLE repo, not the main WebKit repo.

For patches that have been upstreamed, you should choose the 'ours' version,
and the resulting commits after rebase should be mostly empty. For patches
that haven't been upstreamed, resolve conflicts prioritizing 'theirs' when
possible to preserve WebKit's changes.

The script will pause now. Please complete the rebase, then come back and
press Enter to continue:



git status says

Unmerged paths:
  (use "git restore --staged <file>..." to unstage)
  (use "git add/rm <file>..." as appropriate to mark resolution)
        deleted by them: third_party/abseil-cpp
        deleted by them: third_party/android_deps
        deleted by them: third_party/catapult
        deleted by them: third_party/depot_tools
        deleted by them: third_party/libc++/src
        deleted by them: third_party/libc++abi/src