=== Applying patches on top of PostgreSQL commit ID 2c6f2c5e1778e243f5300ec45d0f4b0be15e6325 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Thu Sep 24 16:49:27 UTC 2026 On branch cf/7123 nothing to commit, working tree clean === using 'git am' to apply patch ./v3-0001-Avoid-streaming-zero-filled-WAL-switch-padding.patch === Applying: Avoid streaming zero-filled WAL switch padding Using index info to reconstruct a base tree... M doc/src/sgml/protocol.sgml M src/backend/access/transam/xlog.c M src/include/access/xlog.h M src/include/libpq/protocol.h 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/include/libpq/protocol.h Auto-merging src/include/access/xlog.h Auto-merging src/backend/access/transam/xlog.c Auto-merging doc/src/sgml/protocol.sgml error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 Avoid streaming zero-filled WAL switch padding 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-Avoid-streaming-zero-filled-WAL-switch-padding.patch === patching file doc/src/sgml/protocol.sgml patching file src/backend/access/transam/xlog.c Hunk #1 succeeded at 2452 (offset 51 lines). Hunk #2 succeeded at 3294 (offset 54 lines). Hunk #3 succeeded at 3306 (offset 54 lines). Hunk #4 succeeded at 3324 (offset 54 lines). Hunk #5 succeeded at 3466 (offset 54 lines). Hunk #6 succeeded at 3488 (offset 54 lines). Hunk #7 succeeded at 3498 (offset 54 lines). Hunk #8 succeeded at 3826 (offset 54 lines). Hunk #9 succeeded at 5791 (offset 195 lines). Hunk #10 succeeded at 5911 (offset 195 lines). patching file src/backend/replication/libpqwalreceiver/libpqwalreceiver.c patching file src/backend/replication/repl_gram.y patching file src/backend/replication/walreceiver.c patching file src/backend/replication/walsender.c patching file src/bin/pg_basebackup/receivelog.c patching file src/bin/pg_basebackup/walmethods.c patching file src/bin/pg_basebackup/walmethods.h patching file src/include/access/xlog.h patching file src/include/libpq/protocol.h Hunk #1 succeeded at 78 (offset 3 lines). patching file src/test/recovery/meson.build Hunk #1 FAILED at 65. 1 out of 1 hunk FAILED -- saving rejects to file src/test/recovery/meson.build.rej patching file src/test/recovery/t/057_stream_wal_zeros.pl Unstaged changes after reset: M doc/src/sgml/protocol.sgml M src/backend/access/transam/xlog.c M src/backend/replication/libpqwalreceiver/libpqwalreceiver.c M src/backend/replication/repl_gram.y M src/backend/replication/walreceiver.c M src/backend/replication/walsender.c M src/bin/pg_basebackup/receivelog.c M src/bin/pg_basebackup/walmethods.c M src/bin/pg_basebackup/walmethods.h M src/include/access/xlog.h M src/include/libpq/protocol.h Removing src/test/recovery/meson.build.rej Removing src/test/recovery/t/057_stream_wal_zeros.pl === using 'git apply' to apply patch ./v3-0001-Avoid-streaming-zero-filled-WAL-switch-padding.patch === Applied patch to 'doc/src/sgml/protocol.sgml' cleanly. Applied patch to 'src/backend/access/transam/xlog.c' cleanly. Applied patch to 'src/backend/replication/libpqwalreceiver/libpqwalreceiver.c' cleanly. Applied patch to 'src/backend/replication/repl_gram.y' cleanly. Applied patch to 'src/backend/replication/walreceiver.c' cleanly. Applied patch to 'src/backend/replication/walsender.c' cleanly. Applied patch to 'src/bin/pg_basebackup/receivelog.c' cleanly. Applied patch to 'src/bin/pg_basebackup/walmethods.c' cleanly. Applied patch to 'src/bin/pg_basebackup/walmethods.h' cleanly. Applied patch to 'src/include/access/xlog.h' cleanly. Applied patch to 'src/include/libpq/protocol.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 ebb12dd8766,30eda3573ac..00000000000 --- a/src/test/recovery/meson.build +++ b/src/test/recovery/meson.build @@@ -65,7 -65,7 +65,11 @@@ tests += 't/054_unlogged_sequence_promotion.pl', 't/055_cascade_reconnect.pl', 't/056_standby_snapshot_export.pl', ++<<<<<<< ours + 't/057_snapshot_commit_race.pl', ++======= + 't/057_stream_wal_zeros.pl', ++>>>>>>> theirs ], }, }