=== Applying patches on top of PostgreSQL commit ID 7c8280eeb5872f5c2663b562a9c6fcf8ec8a4b82 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Mon Mar 9 21:39:24 UTC 2026 On branch cf/6452 nothing to commit, working tree clean === using 'git am' to apply patch ./v7-0001-Extend-the-retry-logic-in-pg_sync_replication_slo.patch === Applying: Extend the retry logic in pg_sync_replication_slots() Using index info to reconstruct a base tree... M doc/src/sgml/func/func-admin.sgml M src/backend/replication/logical/slotsync.c Falling back to patching base and 3-way merge... Auto-merging src/backend/replication/logical/slotsync.c CONFLICT (content): Merge conflict in src/backend/replication/logical/slotsync.c Auto-merging doc/src/sgml/func/func-admin.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 Extend the retry logic in pg_sync_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". Unstaged changes after reset: M src/backend/replication/logical/slotsync.c === using patch(1) to apply patch ./v7-0001-Extend-the-retry-logic-in-pg_sync_replication_slo.patch === patching file doc/src/sgml/func/func-admin.sgml Hunk #1 FAILED at 1495. 1 out of 1 hunk FAILED -- saving rejects to file doc/src/sgml/func/func-admin.sgml.rej patching file src/backend/replication/logical/slotsync.c Hunk #1 succeeded at 38 with fuzz 2 (offset 4 lines). Hunk #2 FAILED at 222. 1 out of 2 hunks FAILED -- saving rejects to file src/backend/replication/logical/slotsync.c.rej Unstaged changes after reset: M src/backend/replication/logical/slotsync.c Removing doc/src/sgml/func/func-admin.sgml.rej Removing src/backend/replication/logical/slotsync.c.rej === using 'git apply' to apply patch ./v7-0001-Extend-the-retry-logic-in-pg_sync_replication_slo.patch === Applied patch to 'doc/src/sgml/func/func-admin.sgml' cleanly. Applied patch to 'src/backend/replication/logical/slotsync.c' with conflicts. U src/backend/replication/logical/slotsync.c diff --cc src/backend/replication/logical/slotsync.c index e75db69e3f6,99f4655ff99..00000000000 --- a/src/backend/replication/logical/slotsync.c +++ b/src/backend/replication/logical/slotsync.c @@@ -36,7 -36,7 +36,11 @@@ * * If the WAL prior to the remote slot's confirmed_flush_lsn has not been * flushed on the standby, the slot is marked as RS_TEMPORARY. Once the standby ++<<<<<<< ours + * catches up and flushes that WAL, the slot will be marked as RS_PERSISTENT. ++======= + * catches up and flushes that WAL, the slot is promoted to RS_PERSISTENT. ++>>>>>>> theirs * * The slot sync worker waits for some time before the next synchronization, * with the duration varying based on whether any slots were updated during