=== Applying patches on top of PostgreSQL commit ID 1200dfd60c367e97a5e1f31100d82072eb0178b6 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Thu Aug  6 01:58:33 UTC 2026
On branch cf/6865
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v4-0001-Add-auto-revalidation-infrastructure-for-physical.patch ===
Applying: Add auto-revalidation infrastructure for physical replication slots
=== using 'git am' to apply patch ./v4-0002-Add-auto_revalidate-parameter-to-pg_create_physic.patch ===
Applying: Add auto_revalidate parameter to pg_create_physical_replication_slot
error: sha1 information is lacking or useless (src/backend/replication/walsender.c).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add auto_revalidate parameter to pg_create_physical_replication_slot
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 ./v4-0002-Add-auto_revalidate-parameter-to-pg_create_physic.patch ===
patching file contrib/test_decoding/expected/slot.out
patching file contrib/test_decoding/sql/slot.sql
patching file src/backend/replication/slotfuncs.c
Hunk #5 succeeded at 780 (offset 9 lines).
patching file src/backend/replication/walsender.c
Hunk #1 succeeded at 1320 (offset 38 lines).
patching file src/include/catalog/pg_proc.dat
Hunk #1 succeeded at 11643 (offset 22 lines).
patching file src/test/recovery/meson.build
Hunk #1 FAILED at 62.
1 out of 1 hunk FAILED -- saving rejects to file src/test/recovery/meson.build.rej
Unstaged changes after reset:
M	contrib/test_decoding/expected/slot.out
M	contrib/test_decoding/sql/slot.sql
M	src/backend/replication/slotfuncs.c
M	src/backend/replication/walsender.c
M	src/include/catalog/pg_proc.dat
Removing src/test/recovery/meson.build.rej
=== using 'git apply' to apply patch ./v4-0002-Add-auto_revalidate-parameter-to-pg_create_physic.patch ===
Applied patch to 'contrib/test_decoding/expected/slot.out' cleanly.
Applied patch to 'contrib/test_decoding/sql/slot.sql' cleanly.
Applied patch to 'src/backend/replication/slotfuncs.c' cleanly.
error: repository lacks the necessary blob to perform 3-way merge.
Falling back to direct application...
Applied patch to 'src/include/catalog/pg_proc.dat' cleanly.
Applied patch to 'src/test/recovery/meson.build' with conflicts.
U src/test/recovery/meson.build
diff --cc src/test/recovery/meson.build
index 39ec8c4946d,5e208ffb019..00000000000
--- a/src/test/recovery/meson.build
+++ b/src/test/recovery/meson.build
@@@ -62,8 -62,7 +62,12 @@@ tests += 
        't/051_effective_wal_level.pl',
        't/052_checkpoint_segment_missing.pl',
        't/053_standby_login_event_trigger.pl',
++<<<<<<< ours
 +      't/054_unlogged_sequence_promotion.pl',
 +      't/055_cascade_reconnect.pl',
++=======
+       't/054_auto_revalidate_physical_slot.pl',
++>>>>>>> theirs
      ],
    },
  }