=== Applying patches on top of PostgreSQL commit ID d374280e1837adc1f8218bb0d69ffbae5d808fc6 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Fri Jul 17 20:50:31 UTC 2026 On branch cf/6208 nothing to commit, working tree clean === using 'git am' to apply patch ./v8-Add-pg_get_subscription_ddl-function.patch === Applying: Add pg_get_subscription_ddl() function Using index info to reconstruct a base tree... M doc/src/sgml/func/func-info.sgml M src/backend/utils/adt/ruleutils.c M src/include/catalog/pg_proc.dat 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/include/catalog/pg_proc.dat Auto-merging src/backend/utils/adt/ruleutils.c Auto-merging doc/src/sgml/func/func-info.sgml CONFLICT (content): Merge conflict in doc/src/sgml/func/func-info.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 Add pg_get_subscription_ddl() function 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 ./v8-Add-pg_get_subscription_ddl-function.patch === patching file doc/src/sgml/func/func-info.sgml Hunk #1 succeeded at 3966 (offset 169 lines). patching file src/backend/utils/adt/ruleutils.c Hunk #1 succeeded at 40 with fuzz 2 (offset 5 lines). Hunk #2 succeeded at 63 (offset 5 lines). Hunk #3 succeeded at 561 (offset 13 lines). Hunk #4 succeeded at 14496 (offset 749 lines). patching file src/include/catalog/pg_proc.dat Hunk #1 succeeded at 4019 (offset 26 lines). patching file src/test/regress/expected/subscription.out Hunk #1 succeeded at 919 (offset 397 lines). patching file src/test/regress/sql/subscription.sql Hunk #1 succeeded at 713 (offset 343 lines). [cf/6208 464e468f2a0] Add pg_get_subscription_ddl() function Author: Vaibhav Dalvi Date: Tue Nov 18 11:43:30 2025 +0000 5 files changed, 458 insertions(+)