=== Applying patches on top of PostgreSQL commit ID d6393fc40a59830a88a79bdf08e962122fa9c631 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Mon Oct 5 08:22:34 UTC 2026 On branch cf/6487 nothing to commit, working tree clean === using 'git am' to apply patch ./v6-0001-Pipelined-Recovery-Producer-Related-Code.patch === Applying: Pipelined Recovery - Producer Related Code === using 'git am' to apply patch ./v6-0002-Pipelined-Recovery-Consumer-Related-Code.patch === Applying: Pipelined Recovery - Consumer Related Code === using 'git am' to apply patch ./v6-0003-Pipelined-Recovery-Decoupling-startup-and-produce.patch === Applying: Pipelined Recovery - Decoupling startup and producer states. 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 Pipelined Recovery - Decoupling startup and producer states. 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 ./v6-0003-Pipelined-Recovery-Decoupling-startup-and-produce.patch === patching file src/backend/access/transam/xlog.c Hunk #2 succeeded at 6537 (offset 268 lines). Hunk #3 succeeded at 9377 (offset 446 lines). Hunk #4 succeeded at 10682 (offset 521 lines). patching file src/backend/access/transam/xlogrecovery.c Hunk #8 succeeded at 510 (offset 9 lines). Hunk #9 succeeded at 985 (offset 9 lines). Hunk #10 succeeded at 1004 (offset 9 lines). Hunk #11 succeeded at 1442 (offset 9 lines). Hunk #12 succeeded at 1520 (offset 9 lines). Hunk #13 succeeded at 1579 (offset 9 lines). Hunk #14 succeeded at 1702 (offset 9 lines). Hunk #15 succeeded at 1759 (offset 9 lines). Hunk #16 succeeded at 1871 (offset 9 lines). Hunk #17 succeeded at 1992 (offset 9 lines). Hunk #18 succeeded at 2024 (offset 9 lines). Hunk #19 succeeded at 2067 (offset 9 lines). Hunk #20 succeeded at 2170 (offset 9 lines). Hunk #21 succeeded at 2217 (offset 9 lines). Hunk #22 succeeded at 2242 (offset 9 lines). Hunk #23 succeeded at 2399 (offset 9 lines). Hunk #24 succeeded at 2606 (offset 9 lines). Hunk #25 succeeded at 3169 (offset 9 lines). Hunk #26 succeeded at 3280 (offset 9 lines). Hunk #27 succeeded at 3305 (offset 9 lines). Hunk #28 succeeded at 3420 (offset 9 lines). Hunk #29 succeeded at 3498 (offset 9 lines). Hunk #30 succeeded at 4019 (offset 9 lines). Hunk #31 succeeded at 4032 (offset 9 lines). Hunk #32 succeeded at 4063 (offset 9 lines). Hunk #33 succeeded at 4146 (offset 9 lines). Hunk #34 succeeded at 4231 (offset 9 lines). Hunk #35 succeeded at 4268 (offset 9 lines). Hunk #36 succeeded at 4283 (offset 9 lines). Hunk #37 succeeded at 4327 (offset 9 lines). Hunk #38 succeeded at 4373 (offset 9 lines). Hunk #39 succeeded at 4395 (offset 9 lines). Hunk #40 succeeded at 4562 (offset 9 lines). Hunk #41 succeeded at 4662 (offset 9 lines). Hunk #42 succeeded at 4755 (offset 9 lines). Hunk #43 succeeded at 4769 (offset 9 lines). Hunk #44 succeeded at 4794 (offset 9 lines). Hunk #45 succeeded at 4891 (offset 9 lines). Hunk #46 succeeded at 4967 (offset 35 lines). Hunk #47 succeeded at 5137 (offset 35 lines). Hunk #48 succeeded at 5233 (offset 35 lines). patching file src/backend/storage/ipc/standby.c patching file src/include/access/xlogpipeline.h patching file src/include/access/xlogrecovery.h Hunk #3 succeeded at 113 (offset 6 lines). Hunk #4 succeeded at 148 (offset 6 lines). Hunk #5 succeeded at 284 (offset 6 lines). Hunk #6 succeeded at 308 with fuzz 2 (offset 8 lines). [cf/6487 e9e66ef46dc] Pipelined Recovery - Decoupling startup and producer states. Author: Imran Zaheer Date: Tue Jul 21 10:26:16 2026 +0500 5 files changed, 667 insertions(+), 41 deletions(-) === using 'git am' to apply patch ./v6-0004-Pipelined-Recovery-Add-Tap-test.patch === Applying: Pipelined Recovery - Add Tap test 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 Pipelined Recovery - Add Tap test 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 ./v6-0004-Pipelined-Recovery-Add-Tap-test.patch === patching file src/test/recovery/meson.build Hunk #1 FAILED at 63. 1 out of 1 hunk FAILED -- saving rejects to file src/test/recovery/meson.build.rej patching file src/test/recovery/t/055_walpipeline.pl Removing src/test/recovery/meson.build.rej Removing src/test/recovery/t/055_walpipeline.pl === using 'git apply' to apply patch ./v6-0004-Pipelined-Recovery-Add-Tap-test.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 ebb12dd8766,979c1213332..00000000000 --- a/src/test/recovery/meson.build +++ b/src/test/recovery/meson.build @@@ -63,9 -63,7 +63,13 @@@ tests += 't/052_checkpoint_segment_missing.pl', 't/053_standby_login_event_trigger.pl', 't/054_unlogged_sequence_promotion.pl', ++<<<<<<< ours + 't/055_cascade_reconnect.pl', + 't/056_standby_snapshot_export.pl', + 't/057_snapshot_commit_race.pl', ++======= + 't/055_walpipeline.pl', ++>>>>>>> theirs ], }, }