=== Applying patches on top of PostgreSQL commit ID d699687b329e031cd90e967b39c3fd8a53ef8208 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Thu Aug 7 17:55:18 UTC 2025 On branch cf/5189 nothing to commit, working tree clean === using 'git am' to apply patch ./v4-0001-pg_replication_origin_session_setup-pid-parameter.patch === Applying: pg_replication_origin_session_setup: pid parameter Using index info to reconstruct a base tree... A doc/src/sgml/func.sgml M src/backend/catalog/system_functions.sql M src/backend/replication/logical/origin.c M src/include/catalog/pg_proc.dat Falling back to patching base and 3-way merge... Auto-merging src/include/catalog/pg_proc.dat Auto-merging src/backend/replication/logical/origin.c Auto-merging src/backend/catalog/system_functions.sql CONFLICT (modify/delete): doc/src/sgml/func.sgml deleted in HEAD and modified in pg_replication_origin_session_setup: pid parameter. Version pg_replication_origin_session_setup: pid parameter 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 pg_replication_origin_session_setup: pid parameter 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/catalog/system_functions.sql M src/backend/replication/logical/origin.c M src/include/catalog/pg_proc.dat Removing doc/src/sgml/func.sgml === using patch(1) to apply patch ./v4-0001-pg_replication_origin_session_setup-pid-parameter.patch === can't find file to patch at input line 26 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |From 74a74fd02bce786093c19a23bef9444d0b8ef41d Mon Sep 17 00:00:00 2001 |From: Doruk |Date: Thu, 15 Aug 2024 23:34:26 +0300 |Subject: [PATCH v4] pg_replication_origin_session_setup: pid parameter | |Since the introduction of parallel apply workers (commit 216a784829c), |the replorigin_session_setup() was extended to accept an extra |parameter: pid. This process ID is used to inform that multiple |processes are sharing the same replication origin to apply changes in |parallel. The replorigin_session_setup function has a SQL user |interface: pg_replication_origin_session_setup. This commit adds an |optional parameter that passes the process ID to the internal function |replorigin_session_setup. It allows multiple processes to use the same |replication origin if you are using the replication functions. |--- | doc/src/sgml/func.sgml | 8 +++++++- | src/backend/catalog/system_functions.sql | 9 ++++++++- | src/backend/replication/logical/origin.c | 4 +++- | src/include/catalog/pg_proc.dat | 2 +- | 4 files changed, 19 insertions(+), 4 deletions(-) | |diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml |index 47370e581a..e50e689fb6 100644 |--- a/doc/src/sgml/func.sgml |+++ b/doc/src/sgml/func.sgml -------------------------- No file to patch. Skipping patch. 2 out of 2 hunks ignored patching file src/backend/catalog/system_functions.sql Hunk #1 succeeded at 650 (offset 14 lines). Hunk #2 succeeded at 758 (offset 14 lines). patching file src/backend/replication/logical/origin.c Hunk #1 succeeded at 1374 (offset 19 lines). patching file src/include/catalog/pg_proc.dat Hunk #1 succeeded at 12223 (offset 160 lines). Unstaged changes after reset: M src/backend/catalog/system_functions.sql M src/backend/replication/logical/origin.c M src/include/catalog/pg_proc.dat === using 'git apply' to apply patch ./v4-0001-pg_replication_origin_session_setup-pid-parameter.patch === error: doc/src/sgml/func.sgml: does not exist in index Applied patch to 'src/backend/catalog/system_functions.sql' cleanly. Applied patch to 'src/backend/replication/logical/origin.c' cleanly. Applied patch to 'src/include/catalog/pg_proc.dat' cleanly.