=== Applying patches on top of PostgreSQL commit ID 1200dfd60c367e97a5e1f31100d82072eb0178b6 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Thu Aug 6 01:28:32 UTC 2026 On branch cf/6619 nothing to commit, working tree clean === using 'git am' to apply patch ./v2-0001-Fix-pg_stat_xact_-views-leaking-across-xact-bound.patch === Applying: Fix pg_stat_xact_* views leaking across xact boundaries Using index info to reconstruct a base tree... M src/backend/utils/activity/pgstat.c M src/backend/utils/activity/pgstat_function.c M src/backend/utils/activity/pgstat_relation.c M src/backend/utils/activity/pgstat_xact.c M src/include/pgstat.h M src/include/utils/pgstat_internal.h M src/test/modules/test_misc/meson.build M src/tools/pgindent/typedefs.list Falling back to patching base and 3-way merge... Auto-merging src/tools/pgindent/typedefs.list 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/pgstat_internal.h Auto-merging src/include/pgstat.h Auto-merging src/backend/utils/activity/pgstat_xact.c Auto-merging src/backend/utils/activity/pgstat_relation.c Auto-merging src/backend/utils/activity/pgstat_function.c Auto-merging src/backend/utils/activity/pgstat.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 Fix pg_stat_xact_* views leaking across xact boundaries 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 ./v2-0001-Fix-pg_stat_xact_-views-leaking-across-xact-bound.patch === patching file src/backend/utils/activity/pgstat.c Hunk #2 succeeded at 1338 (offset -19 lines). patching file src/backend/utils/activity/pgstat_function.c patching file src/backend/utils/activity/pgstat_relation.c patching file src/backend/utils/activity/pgstat_xact.c patching file src/include/pgstat.h patching file src/include/utils/pgstat_internal.h Hunk #1 succeeded at 686 (offset 2 lines). patching file src/test/modules/test_misc/meson.build Hunk #1 FAILED at 21. 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/013_pgstat_xact.pl patching file src/tools/pgindent/typedefs.list Hunk #1 succeeded at 2345 (offset 15 lines). Unstaged changes after reset: M src/backend/utils/activity/pgstat.c M src/backend/utils/activity/pgstat_function.c M src/backend/utils/activity/pgstat_relation.c M src/backend/utils/activity/pgstat_xact.c M src/include/pgstat.h M src/include/utils/pgstat_internal.h M src/tools/pgindent/typedefs.list Removing src/test/modules/test_misc/meson.build.rej Removing src/test/modules/test_misc/t/013_pgstat_xact.pl === using 'git apply' to apply patch ./v2-0001-Fix-pg_stat_xact_-views-leaking-across-xact-bound.patch === Applied patch to 'src/backend/utils/activity/pgstat.c' cleanly. Applied patch to 'src/backend/utils/activity/pgstat_function.c' cleanly. Applied patch to 'src/backend/utils/activity/pgstat_relation.c' cleanly. Applied patch to 'src/backend/utils/activity/pgstat_xact.c' cleanly. Applied patch to 'src/include/pgstat.h' cleanly. Applied patch to 'src/include/utils/pgstat_internal.h' cleanly. Applied patch to 'src/test/modules/test_misc/meson.build' with conflicts. Falling back to direct application... Applied patch to 'src/tools/pgindent/typedefs.list' cleanly. U src/test/modules/test_misc/meson.build diff --cc src/test/modules/test_misc/meson.build index ee290698b31,3bc56034fc0..00000000000 --- a/src/test/modules/test_misc/meson.build +++ b/src/test/modules/test_misc/meson.build @@@ -21,8 -21,7 +21,12 @@@ tests += 't/010_index_concurrently_upsert.pl', 't/011_lock_stats.pl', 't/012_ddlutils.pl', ++<<<<<<< ours + 't/013_temp_obj_multisession.pl', + 't/014_log_statement_max_length.pl', ++======= + 't/013_pgstat_xact.pl', ++>>>>>>> theirs ], # The injection points are cluster-wide, so disable installcheck 'runningcheck': false,