=== Applying patches on top of PostgreSQL commit ID e18b0cb7344cb4bd28468f6c0aeeb9b9241d30aa ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Wed Jun 10 20:37:25 UTC 2026
On branch cf/5845
nothing to commit, working tree clean
=== using 'git am' to apply patch ./0006-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/tcop/backend_startup.c
M	src/backend/utils/misc/guc_parameters.dat
M	src/backend/utils/misc/postgresql.conf.sample
M	src/include/utils/guc_hooks.h
M	src/test/modules/test_misc/meson.build
Falling back to patching base and 3-way merge...
Auto-merging src/test/modules/test_misc/meson.build
CONFLICT (content): Merge conflict in src/test/modules/test_misc/meson.build
Auto-merging src/include/utils/guc_hooks.h
Auto-merging src/backend/utils/misc/postgresql.conf.sample
Auto-merging src/backend/utils/misc/guc_parameters.dat
Auto-merging src/backend/tcop/backend_startup.c
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".
=== using patch(1) to apply patch ./0006-Allow-specific-information-to-be-output-directly-by-Postgres.patch ===
patching file doc/src/sgml/config.sgml
Hunk #1 succeeded at 661 (offset 18 lines).
patching file src/backend/tcop/backend_startup.c
Hunk #4 succeeded at 1140 (offset 28 lines).
Hunk #5 succeeded at 1258 (offset 28 lines).
patching file src/backend/utils/misc/guc_parameters.dat
Hunk #1 succeeded at 1060 (offset 50 lines).
patching file src/backend/utils/misc/postgresql.conf.sample
patching file src/include/tcop/backend_startup.h
patching file src/include/utils/guc_hooks.h
patching file src/test/modules/test_misc/meson.build
Hunk #1 FAILED at 19.
1 out of 1 hunk FAILED -- saving rejects to file src/test/modules/test_misc/meson.build.rej
patching file src/test/modules/test_misc/t/011_expose.pl
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/tcop/backend_startup.h
M	src/include/utils/guc_hooks.h
Removing src/test/modules/test_misc/meson.build.rej
Removing src/test/modules/test_misc/t/011_expose.pl
=== using 'git apply' to apply patch ./0006-Allow-specific-information-to-be-output-directly-by-Postgres.patch ===
Applied patch to 'doc/src/sgml/config.sgml' cleanly.
Applied patch to 'src/backend/tcop/backend_startup.c' cleanly.
Applied patch to 'src/backend/utils/misc/guc_parameters.dat' cleanly.
Applied patch to 'src/backend/utils/misc/postgresql.conf.sample' cleanly.
Applied patch to 'src/include/tcop/backend_startup.h' cleanly.
Applied patch to 'src/include/utils/guc_hooks.h' cleanly.
Applied patch to 'src/test/modules/test_misc/meson.build' with conflicts.
Falling back to direct application...
U src/test/modules/test_misc/meson.build
diff --cc src/test/modules/test_misc/meson.build
index 969e90b396d,c40a0455708..00000000000
--- a/src/test/modules/test_misc/meson.build
+++ b/src/test/modules/test_misc/meson.build
@@@ -19,9 -19,7 +19,13 @@@ tests += 
        't/008_replslot_single_user.pl',
        't/009_log_temp_files.pl',
        't/010_index_concurrently_upsert.pl',
++<<<<<<< ours
 +      't/011_lock_stats.pl',
 +      't/012_ddlutils.pl',
 +      't/013_temp_obj_multisession.pl',
++=======
+       't/011_expose.pl',
++>>>>>>> theirs
      ],
      # The injection points are cluster-wide, so disable installcheck
      'runningcheck': false,