=== Applying patches on top of PostgreSQL commit ID 9b5d4e3331753b3399e84965093109cac8f364bf === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Sat Nov 21 20:52:31 UTC 2026 On branch cf/7626 nothing to commit, working tree clean === using 'git am' to apply patch ./v4-0001-Fix-premature-persistence-of-synced-slots-without.patch === Applying: Fix premature persistence of synced slots without a consistent snapshot. Using index info to reconstruct a base tree... 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 error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 Fix premature persistence of synced slots without a consistent snapshot. 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 ./v4-0001-Fix-premature-persistence-of-synced-slots-without.patch === patching file src/backend/replication/logical/slotsync.c Hunk #1 FAILED at 224. Hunk #2 FAILED at 335. Hunk #3 FAILED at 355. Hunk #4 succeeded at 400 with fuzz 1 (offset 17 lines). 3 out of 4 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 src/backend/replication/logical/slotsync.c.rej === using 'git apply' to apply patch ./v4-0001-Fix-premature-persistence-of-synced-slots-without.patch === 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 27debe8e806,c0fbbfba622..00000000000 --- a/src/backend/replication/logical/slotsync.c +++ b/src/backend/replication/logical/slotsync.c @@@ -232,8 -232,8 +232,13 @@@ update_local_synced_slot(RemoteSlot *re /* * A temporary slot reaching here is either newly created, so its ++<<<<<<< ours + * confirmed_flush is not set yet, or it was skipped by an earlier call + * and still has the reason for that. If an earlier call had synced it ++======= + * confirmed_flush is not set yet, or it was skipped by an earlier call and + * still has the reason for that. If an earlier call had synced it ++>>>>>>> theirs * successfully, the caller would have made it persistent already. */ Assert(slot->data.persistency != RS_TEMPORARY ||