=== Applying patches on top of PostgreSQL commit ID 061065e28f086e3e2d7191a7785b9f218b7976d8 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Thu Oct  8 07:51:23 UTC 2026
On branch cf/7264
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v2-0001-Test-GiST-page-recycling-and-deleting-all-entries.patch ===
Applying: Test GiST page recycling and deleting all entries
=== using 'git am' to apply patch ./v2-0002-Add-a-recovery-test-for-GiST-page-deletion-and-re.patch ===
Applying: Add a recovery test for GiST page deletion and reuse
Using index info to reconstruct a base tree...
M	src/test/recovery/meson.build
Falling back to patching base and 3-way merge...
Auto-merging src/test/recovery/meson.build
CONFLICT (content): Merge conflict in src/test/recovery/meson.build
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add a recovery test for GiST page deletion and reuse
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".
=== using patch(1) to apply patch ./v2-0002-Add-a-recovery-test-for-GiST-page-deletion-and-re.patch ===
patching file src/test/recovery/meson.build
Hunk #1 FAILED at 66.
1 out of 1 hunk FAILED -- saving rejects to file src/test/recovery/meson.build.rej
patching file src/test/recovery/t/058_gist_crash_recovery.pl
Removing src/test/recovery/meson.build.rej
Removing src/test/recovery/t/058_gist_crash_recovery.pl
=== using 'git apply' to apply patch ./v2-0002-Add-a-recovery-test-for-GiST-page-deletion-and-re.patch ===
Applied patch to 'src/test/recovery/meson.build' with conflicts.
Falling back to direct application...
U src/test/recovery/meson.build
diff --cc src/test/recovery/meson.build
index e1cf57ff611,b8494285cce..00000000000
--- a/src/test/recovery/meson.build
+++ b/src/test/recovery/meson.build
@@@ -66,8 -66,7 +66,12 @@@ tests += 
        't/055_cascade_reconnect.pl',
        't/056_standby_snapshot_export.pl',
        't/057_snapshot_commit_race.pl',
++<<<<<<< ours
 +      't/058_shutdown_crash_restart.pl',
 +      't/059_remote_apply_status_interval.pl',
++=======
+       't/058_gist_crash_recovery.pl',
++>>>>>>> theirs
      ],
    },
  }