=== Applying patches on top of PostgreSQL commit ID 55fa1b06780ab16a2d48532a3b68451f6b6cc3d8 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Fri Sep 4 06:44:26 UTC 2026 On branch cf/5621 nothing to commit, working tree clean === using 'git am' to apply patch ./v9-0001-Reuse-zstd-contexts-for-WAL-compression-and-decom.patch === Applying: Reuse zstd contexts for WAL compression and decompression === using 'git am' to apply patch ./v9-0002-Add-whole-record-WAL-compression-alongside-FPI-co.patch === Applying: Add whole-record WAL compression alongside FPI compression === using 'git am' to apply patch ./v9-0003-WIP-compress-WAL-records-against-earlier-records-.patch === Applying: WIP: compress WAL records against earlier records in a stream error: sha1 information is lacking or useless (src/backend/access/transam/xlog.c). error: could not build fake ancestor hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 WIP: compress WAL records against earlier records in a stream 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 ./v9-0003-WIP-compress-WAL-records-against-earlier-records-.patch === patching file contrib/pg_walinspect/pg_walinspect.c patching file src/backend/access/transam/xlog.c Hunk #4 succeeded at 606 (offset 8 lines). Hunk #5 succeeded at 788 (offset 8 lines). Hunk #6 succeeded at 822 (offset 8 lines). Hunk #7 succeeded at 973 (offset 8 lines). Hunk #8 succeeded at 1033 (offset 8 lines). Hunk #9 succeeded at 1078 (offset 8 lines). Hunk #10 succeeded at 1112 (offset 8 lines). Hunk #11 succeeded at 1160 (offset 8 lines). Hunk #12 succeeded at 1371 (offset 8 lines). Hunk #13 succeeded at 1398 (offset 8 lines). Hunk #14 succeeded at 1428 (offset 8 lines). Hunk #15 succeeded at 5583 (offset 28 lines). Hunk #16 succeeded at 5671 (offset 28 lines). Hunk #17 succeeded at 5724 (offset 29 lines). Hunk #18 succeeded at 8804 (offset 30 lines). patching file src/backend/access/transam/xloginsert.c Hunk #2 succeeded at 537 (offset -1 lines). Hunk #3 succeeded at 613 (offset -1 lines). Hunk #4 succeeded at 688 (offset -1 lines). Hunk #5 succeeded at 871 (offset -1 lines). Hunk #6 succeeded at 942 (offset -1 lines). Hunk #7 succeeded at 1126 (offset -1 lines). patching file src/backend/access/transam/xlogreader.c patching file src/backend/access/transam/xlogrecovery.c patching file src/backend/postmaster/walsummarizer.c patching file src/backend/replication/logical/logical.c patching file src/backend/replication/logical/logicalfuncs.c patching file src/backend/replication/walsender.c patching file src/backend/utils/activity/wait_event_names.txt patching file src/backend/utils/misc/guc_parameters.dat patching file src/backend/utils/misc/postgresql.conf.sample patching file src/bin/pg_rewind/parsexlog.c patching file src/bin/pg_waldump/pg_waldump.c patching file src/include/access/xlog.h patching file src/include/access/xlogreader.h patching file src/include/access/xlogrecord.h patching file src/include/storage/lwlocklist.h patching file src/test/perl/PostgreSQL/Test/Cluster.pm patching file src/test/recovery/Makefile Hunk #1 succeeded at 11 with fuzz 2. patching file src/test/recovery/meson.build Hunk #1 FAILED at 64. 1 out of 1 hunk FAILED -- saving rejects to file src/test/recovery/meson.build.rej patching file src/test/recovery/t/043_no_contrecord_switch.pl patching file src/test/recovery/t/056_wal_compression.pl (renamed from src/test/recovery/t/052_wal_compression.pl) Unstaged changes after reset: M contrib/pg_walinspect/pg_walinspect.c M src/backend/access/transam/xlog.c M src/backend/access/transam/xloginsert.c M src/backend/access/transam/xlogreader.c M src/backend/access/transam/xlogrecovery.c M src/backend/postmaster/walsummarizer.c M src/backend/replication/logical/logical.c M src/backend/replication/logical/logicalfuncs.c M src/backend/replication/walsender.c M src/backend/utils/activity/wait_event_names.txt M src/backend/utils/misc/guc_parameters.dat M src/backend/utils/misc/postgresql.conf.sample M src/bin/pg_rewind/parsexlog.c M src/bin/pg_waldump/pg_waldump.c M src/include/access/xlog.h M src/include/access/xlogreader.h M src/include/access/xlogrecord.h M src/include/storage/lwlocklist.h M src/test/perl/PostgreSQL/Test/Cluster.pm M src/test/recovery/Makefile M src/test/recovery/t/043_no_contrecord_switch.pl D src/test/recovery/t/052_wal_compression.pl Removing src/test/recovery/meson.build.rej Removing src/test/recovery/t/056_wal_compression.pl === using 'git apply' to apply patch ./v9-0003-WIP-compress-WAL-records-against-earlier-records-.patch === Applied patch to 'contrib/pg_walinspect/pg_walinspect.c' cleanly. error: repository lacks the necessary blob to perform 3-way merge. Falling back to direct application... error: repository lacks the necessary blob to perform 3-way merge. Falling back to direct application... Applied patch to 'src/backend/access/transam/xlogreader.c' cleanly. Applied patch to 'src/backend/access/transam/xlogrecovery.c' cleanly. Applied patch to 'src/backend/postmaster/walsummarizer.c' cleanly. Applied patch to 'src/backend/replication/logical/logical.c' cleanly. Applied patch to 'src/backend/replication/logical/logicalfuncs.c' cleanly. Applied patch to 'src/backend/replication/walsender.c' cleanly. Applied patch to 'src/backend/utils/activity/wait_event_names.txt' cleanly. Applied patch to 'src/backend/utils/misc/guc_parameters.dat' cleanly. Applied patch to 'src/backend/utils/misc/postgresql.conf.sample' cleanly. Applied patch to 'src/bin/pg_rewind/parsexlog.c' cleanly. Applied patch to 'src/bin/pg_waldump/pg_waldump.c' cleanly. error: repository lacks the necessary blob to perform 3-way merge. Falling back to direct application... Applied patch to 'src/include/access/xlogreader.h' cleanly. Applied patch to 'src/include/access/xlogrecord.h' cleanly. Applied patch to 'src/include/storage/lwlocklist.h' cleanly. Applied patch to 'src/test/perl/PostgreSQL/Test/Cluster.pm' cleanly. Applied patch to 'src/test/recovery/Makefile' cleanly. Applied patch to 'src/test/recovery/meson.build' with conflicts. Applied patch to 'src/test/recovery/t/043_no_contrecord_switch.pl' cleanly. Applied patch to 'src/test/recovery/t/056_wal_compression.pl' cleanly. U src/test/recovery/meson.build diff --cc src/test/recovery/meson.build index 72113c5ac6e,b119596c08c..00000000000 --- a/src/test/recovery/meson.build +++ b/src/test/recovery/meson.build @@@ -64,7 -64,7 +64,11 @@@ tests += 't/053_standby_login_event_trigger.pl', 't/054_unlogged_sequence_promotion.pl', 't/055_cascade_reconnect.pl', ++<<<<<<< ours + 't/056_standby_snapshot_export.pl', ++======= + 't/056_wal_compression.pl', ++>>>>>>> theirs ], }, }