=== Applying patches on top of PostgreSQL commit ID 637aa273e6335c2e4d196f510d6787210403ed24 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Thu Jul 16 17:52:32 UTC 2026
On branch cf/6690
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v3-0001-Prevent-repeated-deadlock-check-signals-in-standb.patch ===
Applying: Prevent repeated deadlock-check signals in standby buffer pin waits
Using index info to reconstruct a base tree...
M	src/backend/storage/buffer/bufmgr.c
M	src/backend/storage/ipc/standby.c
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
Auto-merging src/backend/storage/ipc/standby.c
Auto-merging src/backend/storage/buffer/bufmgr.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Prevent repeated deadlock-check signals in standby buffer pin waits
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 ./v3-0001-Prevent-repeated-deadlock-check-signals-in-standb.patch ===
patching file src/backend/storage/buffer/bufmgr.c
Hunk #1 succeeded at 6809 (offset 20 lines).
patching file src/backend/storage/ipc/standby.c
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_bufferpin_conflict_log_timing.pl
Unstaged changes after reset:
M	src/backend/storage/buffer/bufmgr.c
M	src/backend/storage/ipc/standby.c
M	src/include/storage/standby.h
Removing src/test/recovery/meson.build.rej
Removing src/test/recovery/t/054_bufferpin_conflict_log_timing.pl
=== using 'git apply' to apply patch ./v3-0001-Prevent-repeated-deadlock-check-signals-in-standb.patch ===
Applied patch to 'src/backend/storage/buffer/bufmgr.c' cleanly.
Applied patch to 'src/backend/storage/ipc/standby.c' cleanly.
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 ad0d85f4189,64d05d5041c..00000000000
--- a/src/test/recovery/meson.build
+++ b/src/test/recovery/meson.build
@@@ -62,7 -62,7 +62,11 @@@ 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/054_bufferpin_conflict_log_timing.pl',
++>>>>>>> theirs
      ],
    },
  }