=== Applying patches on top of PostgreSQL commit ID 207b5293b8d9a217bb918b5b44774b3b4f1e2f89 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Fri Nov 20 22:12:32 UTC 2026 On branch cf/7299 nothing to commit, working tree clean === using 'git am' to apply patch ./v5-0001-Allow-selected-PANIC-errors-to-skip-core-dumps.patch === Applying: Allow selected PANIC errors to skip core dumps Using index info to reconstruct a base tree... M doc/src/sgml/config.sgml M src/backend/utils/error/elog.c M src/backend/utils/misc/guc_parameters.dat M src/include/utils/elog.h Falling back to patching base and 3-way merge... Auto-merging src/include/utils/elog.h Auto-merging src/backend/utils/misc/guc_parameters.dat Auto-merging src/backend/utils/error/elog.c Auto-merging doc/src/sgml/config.sgml === using 'git am' to apply patch ./v5-0002-Avoid-core-dumps-for-WAL-disk-full-failures.patch === Applying: Avoid core dumps for WAL disk-full failures === using 'git am' to apply patch ./v5-0003-Test-PANIC-core-dump-suppression.patch === Applying: Test PANIC core-dump suppression Using index info to reconstruct a base tree... 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 error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 Test PANIC core-dump suppression 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 ./v5-0003-Test-PANIC-core-dump-suppression.patch === patching file src/test/modules/injection_points/injection_points--1.0.sql patching file src/test/modules/injection_points/injection_points.c patching file src/test/modules/test_misc/meson.build Hunk #1 FAILED at 24. 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/016_panic_no_core.pl Unstaged changes after reset: M src/test/modules/injection_points/injection_points--1.0.sql M src/test/modules/injection_points/injection_points.c Removing src/test/modules/test_misc/meson.build.rej Removing src/test/modules/test_misc/t/016_panic_no_core.pl === using 'git apply' to apply patch ./v5-0003-Test-PANIC-core-dump-suppression.patch === Applied patch to 'src/test/modules/injection_points/injection_points--1.0.sql' cleanly. Applied patch to 'src/test/modules/injection_points/injection_points.c' 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 5225aa280ca,4c520a339f8..00000000000 --- a/src/test/modules/test_misc/meson.build +++ b/src/test/modules/test_misc/meson.build @@@ -24,7 -24,7 +24,11 @@@ tests += 't/013_temp_obj_multisession.pl', 't/014_log_statement_max_length.pl', 't/015_temp_schema_exit_deferrable.pl', ++<<<<<<< ours + 't/016_heap_scan_stream.pl', ++======= + 't/016_panic_no_core.pl', ++>>>>>>> theirs ], # The injection points are cluster-wide, so disable installcheck 'runningcheck': false,