=== Applying patches on top of PostgreSQL commit ID 69800557ca32c493853b937916789f0f3da88efe ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Fri Aug  7 15:28:26 UTC 2026
On branch cf/7121
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v1-0001-xlogrecovery-make-ConfirmRecoveryPaused-and-Check.patch ===
Applying: xlogrecovery: make ConfirmRecoveryPaused and CheckForStandbyTrigger extern
=== using 'git am' to apply patch ./v1-0002-Add-recovery_pause_on_logical_slot_conflict-GUC.patch ===
Applying: Add recovery_pause_on_logical_slot_conflict GUC
error: sha1 information is lacking or useless (src/backend/access/transam/xlogrecovery.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 recovery_pause_on_logical_slot_conflict GUC
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 ./v1-0002-Add-recovery_pause_on_logical_slot_conflict-GUC.patch ===
patching file src/backend/access/transam/xlogrecovery.c
Hunk #1 succeeded at 97 (offset 1 line).
Hunk #2 succeeded at 4462 (offset 7 lines).
patching file src/backend/storage/ipc/standby.c
patching file src/backend/utils/misc/guc_parameters.dat
Hunk #1 succeeded at 2457 (offset 16 lines).
patching file src/backend/utils/misc/postgresql.conf.sample
Hunk #1 succeeded at 405 (offset 2 lines).
patching file src/include/access/xlogrecovery.h
patching file src/include/storage/standby.h
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
patching file src/test/recovery/t/054_recovery_pause_on_slot_conflict.pl
Unstaged changes after reset:
M	src/backend/access/transam/xlogrecovery.c
M	src/backend/storage/ipc/standby.c
M	src/backend/utils/misc/guc_parameters.dat
M	src/backend/utils/misc/postgresql.conf.sample
M	src/include/access/xlogrecovery.h
M	src/include/storage/standby.h
Removing src/test/recovery/meson.build.rej
Removing src/test/recovery/t/054_recovery_pause_on_slot_conflict.pl
=== using 'git apply' to apply patch ./v1-0002-Add-recovery_pause_on_logical_slot_conflict-GUC.patch ===
error: repository lacks the necessary blob to perform 3-way merge.
Falling back to direct application...
Applied patch to 'src/backend/storage/ipc/standby.c' cleanly.
Applied patch to 'src/backend/utils/misc/guc_parameters.dat' cleanly.
Applied patch to 'src/backend/utils/misc/postgresql.conf.sample' cleanly.
error: repository lacks the necessary blob to perform 3-way merge.
Falling back to direct application...
Applied patch to 'src/include/storage/standby.h' cleanly.
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 39ec8c4946d,ae794cb5bae..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_recovery_pause_on_slot_conflict.pl',
++>>>>>>> theirs
      ],
    },
  }