=== Applying patches on top of PostgreSQL commit ID 14ee8e6403001c3788f2622cdcf81a8451502dc2 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Fri Oct 24 14:06:24 UTC 2025
On branch cf/6164
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v2-REL15-0001-ci-macos-Upgrade-images-to-Sequoia.patch ===
Applying: ci: macos: Upgrade images to Sequoia
Using index info to reconstruct a base tree...
M	.cirrus.tasks.yml
Falling back to patching base and 3-way merge...
Auto-merging .cirrus.tasks.yml
CONFLICT (content): Merge conflict in .cirrus.tasks.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 ci: macos: Upgrade images to Sequoia
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Unstaged changes after reset:
M	.cirrus.tasks.yml
=== using patch(1) to apply patch ./v2-REL15-0001-ci-macos-Upgrade-images-to-Sequoia.patch ===
patching file .cirrus.tasks.yml
Hunk #1 FAILED at 208.
Hunk #2 succeeded at 625 (offset 408 lines).
1 out of 2 hunks FAILED -- saving rejects to file .cirrus.tasks.yml.rej
Unstaged changes after reset:
M	.cirrus.tasks.yml
Removing .cirrus.tasks.yml.rej
=== using 'git apply' to apply patch ./v2-REL15-0001-ci-macos-Upgrade-images-to-Sequoia.patch ===
Applied patch to '.cirrus.tasks.yml' with conflicts.
U .cirrus.tasks.yml
diff --cc .cirrus.tasks.yml
index eca9d62fc22,8de5bcaf1b3..00000000000
--- a/.cirrus.tasks.yml
+++ b/.cirrus.tasks.yml
@@@ -610,13 -206,9 +610,17 @@@ task
      cores_script: src/tools/ci/cores_backtrace.sh linux /tmp/cores
  
  
 +# NB: macOS is by far the most expensive OS to run CI for, therefore no
 +# expensive additional checks should be added.
 +#
 +# SPECIAL:
 +# - Enables --clone for pg_upgrade and pg_combinebackup
  task:
++<<<<<<< ours
 +  name: macOS - Sonoma - Meson
++=======
+   name: macOS - Sequoia
++>>>>>>> theirs
  
    env:
      CPUS: 4 # always get that much for cirrusci macOS instances