=== Applying patches on top of PostgreSQL commit ID de74d1e9a5453b8efe2eda2afebcf8218a503184 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Fri Apr 10 15:57:27 UTC 2026 On branch cf/6611 nothing to commit, working tree clean warning: quoted CRLF detected === using 'git am' to apply patch ./0001-Add-prepared_orphaned_transaction_timeout-GUC.patch === Applying: Add prepared_orphaned_transaction_timeout GUC Using index info to reconstruct a base tree... M doc/src/sgml/config.sgml M src/backend/access/transam/twophase.c M src/backend/postmaster/checkpointer.c M src/backend/utils/misc/guc_parameters.dat M src/backend/utils/misc/postgresql.conf.sample M src/include/access/twophase.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/access/twophase.h Auto-merging src/backend/utils/misc/postgresql.conf.sample Auto-merging src/backend/utils/misc/guc_parameters.dat Auto-merging src/backend/postmaster/checkpointer.c Auto-merging src/backend/access/transam/twophase.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 Add prepared_orphaned_transaction_timeout GUC 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 ./0001-Add-prepared_orphaned_transaction_timeout-GUC.patch === patching file doc/src/sgml/config.sgml Hunk #1 succeeded at 10770 (offset 303 lines). patching file src/backend/access/transam/twophase.c Hunk #1 succeeded at 117 (offset 1 line). Hunk #2 succeeded at 2879 (offset 3 lines). patching file src/backend/postmaster/checkpointer.c Hunk #2 succeeded at 578 (offset 9 lines). patching file src/backend/utils/misc/guc_parameters.dat Hunk #1 succeeded at 2389 (offset 83 lines). patching file src/backend/utils/misc/postgresql.conf.sample patching file src/include/access/twophase.h Hunk #1 succeeded at 30 with fuzz 2 (offset 5 lines). Hunk #2 succeeded at 73 (offset 2 lines). 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_prepared_orphaned_timeout.pl Unstaged changes after reset: M doc/src/sgml/config.sgml M src/backend/access/transam/twophase.c M src/backend/postmaster/checkpointer.c M src/backend/utils/misc/guc_parameters.dat M src/backend/utils/misc/postgresql.conf.sample M src/include/access/twophase.h Removing src/test/modules/test_misc/meson.build.rej Removing src/test/modules/test_misc/t/011_prepared_orphaned_timeout.pl === using 'git apply' to apply patch ./0001-Add-prepared_orphaned_transaction_timeout-GUC.patch === /work/patches/./0001-Add-prepared_orphaned_transaction_timeout-GUC.patch:439: trailing whitespace. /work/patches/./0001-Add-prepared_orphaned_transaction_timeout-GUC.patch:440: trailing whitespace. # Copyright (c) 2026, PostgreSQL Global Development Group /work/patches/./0001-Add-prepared_orphaned_transaction_timeout-GUC.patch:441: trailing whitespace. /work/patches/./0001-Add-prepared_orphaned_transaction_timeout-GUC.patch:442: trailing whitespace. # Test for prepared_orphaned_transaction_timeout GUC. /work/patches/./0001-Add-prepared_orphaned_transaction_timeout-GUC.patch:443: trailing whitespace. # Verifies that orphaned prepared transactions are automatically Applied patch to 'doc/src/sgml/config.sgml' cleanly. Applied patch to 'src/backend/access/transam/twophase.c' cleanly. Applied patch to 'src/backend/postmaster/checkpointer.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/access/twophase.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 warning: squelched 198 whitespace errors warning: 203 lines add whitespace errors. diff --cc src/test/modules/test_misc/meson.build index 1b25d98f7f3,8f71efcfe69..00000000000 --- a/src/test/modules/test_misc/meson.build +++ b/src/test/modules/test_misc/meson.build @@@ -19,7 -19,7 +19,11 @@@ 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/011_prepared_orphaned_timeout.pl', ++>>>>>>> theirs ], # The injection points are cluster-wide, so disable installcheck 'runningcheck': false,