From 01a9012fe66fe61b83a6a3b38334846a0a070532 Mon Sep 17 00:00:00 2001 From: humbletim Date: Sat, 12 Oct 2024 20:34:20 -0400 Subject: [PATCH] sgeo-7.1.10 alternate strategy 2.1 --- sgeo-7.1.10/000.bash | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/sgeo-7.1.10/000.bash b/sgeo-7.1.10/000.bash index 0d3a5df0f8..86849bbf7d 100644 --- a/sgeo-7.1.10/000.bash +++ b/sgeo-7.1.10/000.bash @@ -13,16 +13,15 @@ gha-cache-restore $cache_id-repo-0000 repo/viewer || ( git remote add sgeo https://github.com/Sgeo/phoenix-firestorm-alpha git fetch sgeo VR_Sgeo_2024 git -c user.email=CITEST -c user.name=CITEST \ - merge --no-edit sgeo/VR_Sgeo_2024 - - # NOTES: - # ... capture wholemeal between manually-patched worktree and an original Firestormx worktree - # diff -ur --binary . ../Firestormx/ > ../VR_Sgeo_2024.7.1.10.wholmeal.patch - # ... blindly copy conflicting files from manually patched work tree: - # tar -C ../Fixed -cf - `git status|grep both|sed -e 's@both modified:@@;'` | tar xf - - patch -p1 < $nunja_dir/VR_Sgeo_2024.7.1.10.mergeconflict-fixes.patch - - git -c user.email=CITEST -c user.name=CITEST commit -m "VR_Sgeo_2024.7.1.10 locally patched" + merge --no-edit sgeo/VR_Sgeo_2024 || { + # NOTES: + # ... capture wholemeal between manually-patched worktree and an original Firestormx worktree + # diff -ur --binary . ../Firestormx/ > ../VR_Sgeo_2024.7.1.10.wholmeal.patch + # ... blindly copy conflicting files from manually patched work tree: + # tar -C ../Fixed -cf - `git status|grep both|sed -e 's@both modified:@@;'` | tar xf - + patch -p1 < $nunja_dir/VR_Sgeo_2024.7.1.10.mergeconflict-fixes.patch + git -c user.email=CITEST -c user.name=CITEST commit -m "VR_Sgeo_2024.7.1.10 locally patched" + } patch -p1 < <(cat <<'EOF' diff --git a/indra/newview/llviewerVR.h b/indra/newview/llviewerVR.h