=== Applying patches on top of PostgreSQL commit ID d4c15309e7ed6e30e360b5911e1f4d3ca754aa2b === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Tue Oct 6 07:30:36 UTC 2026 On branch cf/7103 nothing to commit, working tree clean === using 'git am' to apply patch ./v15-0001-Invalidate-XID-aged-replication-slots.patch === Applying: Invalidate XID-aged replication slots. Using index info to reconstruct a base tree... M doc/src/sgml/config.sgml M doc/src/sgml/maintenance.sgml M src/backend/access/transam/xlog.c M src/backend/replication/slot.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/replication/slot.c Auto-merging src/backend/access/transam/xlog.c Auto-merging doc/src/sgml/maintenance.sgml Auto-merging doc/src/sgml/config.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 Invalidate XID-aged replication slots. 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 ./v15-0001-Invalidate-XID-aged-replication-slots.patch === patching file doc/src/sgml/config.sgml patching file doc/src/sgml/logical-replication.sgml patching file doc/src/sgml/maintenance.sgml patching file doc/src/sgml/system-views.sgml patching file src/backend/access/transam/xlog.c patching file src/backend/replication/slot.c Hunk #3 succeeded at 1807 (offset 8 lines). Hunk #4 succeeded at 1854 (offset 8 lines). Hunk #5 succeeded at 1950 (offset 8 lines). Hunk #6 succeeded at 2007 (offset 8 lines). Hunk #7 succeeded at 2081 (offset 8 lines). Hunk #8 succeeded at 2139 (offset 8 lines). Hunk #9 succeeded at 2156 (offset 8 lines). Hunk #10 succeeded at 2195 (offset 8 lines). Hunk #11 succeeded at 2290 (offset 8 lines). Hunk #12 succeeded at 2344 (offset 8 lines). Hunk #13 succeeded at 2372 (offset 8 lines). Hunk #14 succeeded at 2390 (offset 8 lines). Hunk #15 succeeded at 2404 (offset 8 lines). Hunk #16 succeeded at 2431 (offset 8 lines). patching file src/backend/utils/misc/guc_parameters.dat patching file src/backend/utils/misc/postgresql.conf.sample patching file src/bin/pg_basebackup/pg_createsubscriber.c patching file src/include/replication/slot.h 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/099_invalidate_xid_aged_slots.pl Unstaged changes after reset: M doc/src/sgml/config.sgml M doc/src/sgml/logical-replication.sgml M doc/src/sgml/maintenance.sgml M doc/src/sgml/system-views.sgml M src/backend/access/transam/xlog.c M src/backend/replication/slot.c M src/backend/utils/misc/guc_parameters.dat M src/backend/utils/misc/postgresql.conf.sample M src/bin/pg_basebackup/pg_createsubscriber.c M src/include/replication/slot.h Removing src/test/recovery/meson.build.rej Removing src/test/recovery/t/099_invalidate_xid_aged_slots.pl === using 'git apply' to apply patch ./v15-0001-Invalidate-XID-aged-replication-slots.patch === Applied patch to 'doc/src/sgml/config.sgml' cleanly. Applied patch to 'doc/src/sgml/logical-replication.sgml' cleanly. Applied patch to 'doc/src/sgml/maintenance.sgml' cleanly. Applied patch to 'doc/src/sgml/system-views.sgml' cleanly. Applied patch to 'src/backend/access/transam/xlog.c' cleanly. Applied patch to 'src/backend/replication/slot.c' 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_basebackup/pg_createsubscriber.c' cleanly. Applied patch to 'src/include/replication/slot.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,c739fdad04f..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/099_invalidate_xid_aged_slots.pl', ++>>>>>>> theirs ], }, }