=== Applying patches on top of PostgreSQL commit ID d4c0f91f7d57066b9d62c0eccb2a913d40c14066 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Mon Nov 24 09:16:21 UTC 2025 On branch cf/5845 nothing to commit, working tree clean === using 'git am' to apply patch ./0004-Allow-specific-information-to-be-output-directly-by-Postgres.patch === Applying: Allow specific information to be output directly by Postgres. Using index info to reconstruct a base tree... M doc/src/sgml/config.sgml M src/backend/utils/misc/guc_parameters.dat M src/backend/utils/misc/postgresql.conf.sample Falling back to patching base and 3-way merge... Auto-merging src/backend/utils/misc/postgresql.conf.sample Auto-merging src/backend/utils/misc/guc_parameters.dat CONFLICT (content): Merge conflict in src/backend/utils/misc/guc_parameters.dat Auto-merging doc/src/sgml/config.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 Allow specific information to be output directly by Postgres. 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 doc/src/sgml/config.sgml M src/backend/tcop/backend_startup.c M src/backend/utils/misc/guc_parameters.dat M src/backend/utils/misc/postgresql.conf.sample M src/include/postmaster/postmaster.h M src/test/modules/test_misc/meson.build Removing src/test/modules/test_misc/t/010_expose.pl === using patch(1) to apply patch ./0004-Allow-specific-information-to-be-output-directly-by-Postgres.patch === patching file doc/src/sgml/config.sgml patching file src/backend/tcop/backend_startup.c patching file src/backend/utils/misc/guc_parameters.dat Hunk #1 succeeded at 106 with fuzz 1 (offset -538 lines). patching file src/backend/utils/misc/postgresql.conf.sample Hunk #1 succeeded at 91 with fuzz 2. patching file src/include/postmaster/postmaster.h patching file src/test/modules/test_misc/meson.build patching file src/test/modules/test_misc/t/010_expose.pl [cf/5845 78a13d695b0] Allow specific information to be output directly by Postgres. Author: Greg Sabino Mullane Date: Sat May 31 00:38:26 2025 -0400 7 files changed, 397 insertions(+) create mode 100644 src/test/modules/test_misc/t/010_expose.pl