=== Applying patches on top of PostgreSQL commit ID 83f2f8413e8d9687fda7d5881c82b89b8d9d4043 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Fri Dec 5 02:37:23 UTC 2025 On branch cf/5664 nothing to commit, working tree clean === using 'git am' to apply patch ./v19-0001-PG17-Approach-3-Fix-slot-synchronization-for-two.patch === Applying: PG17 Approach 3 Fix slot synchronization for two-phase enabled slots. Using index info to reconstruct a base tree... A doc/src/sgml/func.sgml M doc/src/sgml/protocol.sgml M doc/src/sgml/ref/alter_subscription.sgml M doc/src/sgml/ref/create_subscription.sgml M src/backend/commands/subscriptioncmds.c M src/backend/replication/logical/logical.c M src/backend/replication/logical/slotsync.c M src/backend/replication/slot.c M src/bin/pg_upgrade/t/003_logical_slots.pl M src/test/recovery/t/040_standby_failover_slots_sync.pl M src/test/regress/expected/subscription.out M src/test/regress/sql/subscription.sql Falling back to patching base and 3-way merge... Auto-merging src/test/regress/sql/subscription.sql Auto-merging src/test/regress/expected/subscription.out Auto-merging src/test/recovery/t/040_standby_failover_slots_sync.pl Auto-merging src/bin/pg_upgrade/t/003_logical_slots.pl Auto-merging src/backend/replication/slot.c CONFLICT (content): Merge conflict in src/backend/replication/slot.c Auto-merging src/backend/replication/logical/slotsync.c Auto-merging src/backend/replication/logical/logical.c Auto-merging src/backend/commands/subscriptioncmds.c CONFLICT (content): Merge conflict in src/backend/commands/subscriptioncmds.c Auto-merging doc/src/sgml/ref/create_subscription.sgml Auto-merging doc/src/sgml/ref/alter_subscription.sgml CONFLICT (content): Merge conflict in doc/src/sgml/ref/alter_subscription.sgml Auto-merging doc/src/sgml/protocol.sgml CONFLICT (modify/delete): doc/src/sgml/func.sgml deleted in HEAD and modified in PG17 Approach 3 Fix slot synchronization for two-phase enabled slots.. Version PG17 Approach 3 Fix slot synchronization for two-phase enabled slots. of doc/src/sgml/func.sgml left in tree. error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 PG17 Approach 3 Fix slot synchronization for two-phase enabled 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". Unstaged changes after reset: M contrib/test_decoding/expected/slot.out M contrib/test_decoding/sql/slot.sql M doc/src/sgml/protocol.sgml M doc/src/sgml/ref/alter_subscription.sgml M doc/src/sgml/ref/create_subscription.sgml M src/backend/commands/subscriptioncmds.c M src/backend/replication/logical/logical.c M src/backend/replication/logical/slotsync.c M src/backend/replication/slot.c M src/bin/pg_upgrade/t/003_logical_slots.pl M src/test/recovery/t/040_standby_failover_slots_sync.pl M src/test/regress/expected/subscription.out M src/test/regress/sql/subscription.sql Removing doc/src/sgml/func.sgml === using patch(1) to apply patch ./v19-0001-PG17-Approach-3-Fix-slot-synchronization-for-two.patch === patching file contrib/test_decoding/expected/slot.out patching file contrib/test_decoding/sql/slot.sql can't find file to patch at input line 73 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml |index 697c1a02891..45504cf14d5 100644 |--- a/doc/src/sgml/func.sgml |+++ b/doc/src/sgml/func.sgml -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored patching file doc/src/sgml/protocol.sgml Hunk #1 succeeded at 2283 (offset 221 lines). Hunk #2 succeeded at 2333 (offset 221 lines). patching file doc/src/sgml/ref/alter_subscription.sgml Hunk #1 succeeded at 260 with fuzz 2 (offset 3 lines). patching file doc/src/sgml/ref/create_subscription.sgml Hunk #1 succeeded at 372 (offset 18 lines). Hunk #2 succeeded at 453 with fuzz 1 (offset 19 lines). patching file src/backend/commands/subscriptioncmds.c Hunk #1 succeeded at 657 (offset 9 lines). Hunk #2 succeeded at 1109 with fuzz 2 (offset -151 lines). patching file src/backend/replication/logical/logical.c Hunk #1 succeeded at 596 (offset -17 lines). patching file src/backend/replication/logical/slotsync.c patching file src/backend/replication/slot.c Hunk #1 succeeded at 423 (offset 80 lines). Hunk #2 FAILED at 865. 1 out of 2 hunks FAILED -- saving rejects to file src/backend/replication/slot.c.rej patching file src/bin/pg_upgrade/t/003_logical_slots.pl patching file src/test/recovery/t/040_standby_failover_slots_sync.pl Hunk #1 succeeded at 105 with fuzz 1 (offset 7 lines). patching file src/test/regress/expected/subscription.out Hunk #1 succeeded at 518 (offset 39 lines). patching file src/test/regress/sql/subscription.sql Hunk #1 succeeded at 366 (offset 24 lines). Unstaged changes after reset: M contrib/test_decoding/expected/slot.out M contrib/test_decoding/sql/slot.sql M doc/src/sgml/protocol.sgml M doc/src/sgml/ref/alter_subscription.sgml M doc/src/sgml/ref/create_subscription.sgml M src/backend/commands/subscriptioncmds.c M src/backend/replication/logical/logical.c M src/backend/replication/logical/slotsync.c M src/backend/replication/slot.c M src/bin/pg_upgrade/t/003_logical_slots.pl M src/test/recovery/t/040_standby_failover_slots_sync.pl M src/test/regress/expected/subscription.out M src/test/regress/sql/subscription.sql Removing src/backend/replication/slot.c.rej === using 'git apply' to apply patch ./v19-0001-PG17-Approach-3-Fix-slot-synchronization-for-two.patch === Applied patch to 'contrib/test_decoding/expected/slot.out' cleanly. Applied patch to 'contrib/test_decoding/sql/slot.sql' cleanly. error: doc/src/sgml/func.sgml: does not exist in index Applied patch to 'doc/src/sgml/protocol.sgml' cleanly. Applied patch to 'doc/src/sgml/ref/alter_subscription.sgml' with conflicts. Applied patch to 'doc/src/sgml/ref/create_subscription.sgml' cleanly. Applied patch to 'src/backend/commands/subscriptioncmds.c' with conflicts. Applied patch to 'src/backend/replication/logical/logical.c' cleanly. Applied patch to 'src/backend/replication/logical/slotsync.c' cleanly. Applied patch to 'src/backend/replication/slot.c' with conflicts. Applied patch to 'src/bin/pg_upgrade/t/003_logical_slots.pl' cleanly. Applied patch to 'src/test/recovery/t/040_standby_failover_slots_sync.pl' cleanly. Applied patch to 'src/test/regress/expected/subscription.out' cleanly. Applied patch to 'src/test/regress/sql/subscription.sql' cleanly.