=== Applying patches on top of PostgreSQL commit ID 26cb14aea12a0f0c2f9a49de3865721936b711a7 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Thu Jan 22 01:39:21 UTC 2026 On branch cf/6308 nothing to commit, working tree clean === using 'git am' to apply patch ./0001-pg_stat_statements_last_executed.patch === Applying: Add last_executed timestamp to pg_stat_statements .git/rebase-apply/patch:394: trailing whitespace. SELECT .git/rebase-apply/patch:408: trailing whitespace. SELECT .git/rebase-apply/patch:426: trailing whitespace. SELECT warning: 3 lines add whitespace errors. Using index info to reconstruct a base tree... M contrib/pg_stat_statements/Makefile M contrib/pg_stat_statements/meson.build M contrib/pg_stat_statements/pg_stat_statements.c Falling back to patching base and 3-way merge... Auto-merging contrib/pg_stat_statements/pg_stat_statements.c Auto-merging contrib/pg_stat_statements/meson.build CONFLICT (content): Merge conflict in contrib/pg_stat_statements/meson.build Auto-merging contrib/pg_stat_statements/Makefile CONFLICT (content): Merge conflict in contrib/pg_stat_statements/Makefile 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 last_executed timestamp to pg_stat_statements 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 contrib/pg_stat_statements/Makefile M contrib/pg_stat_statements/meson.build M contrib/pg_stat_statements/pg_stat_statements.c M contrib/pg_stat_statements/pg_stat_statements.control M doc/src/sgml/pgstatstatements.sgml Removing contrib/pg_stat_statements/expected/last_executed.out Removing contrib/pg_stat_statements/pg_stat_statements--1.13--1.14.sql Removing contrib/pg_stat_statements/sql/last_executed.sql === using patch(1) to apply patch ./0001-pg_stat_statements_last_executed.patch === patching file contrib/pg_stat_statements/Makefile Hunk #2 FAILED at 22. 1 out of 2 hunks FAILED -- saving rejects to file contrib/pg_stat_statements/Makefile.rej patching file contrib/pg_stat_statements/expected/last_executed.out patching file contrib/pg_stat_statements/meson.build Hunk #2 FAILED at 60. 1 out of 2 hunks FAILED -- saving rejects to file contrib/pg_stat_statements/meson.build.rej patching file contrib/pg_stat_statements/pg_stat_statements--1.13--1.14.sql patching file contrib/pg_stat_statements/pg_stat_statements.c patching file contrib/pg_stat_statements/pg_stat_statements.control patching file contrib/pg_stat_statements/sql/last_executed.sql patching file doc/src/sgml/pgstatstatements.sgml Unstaged changes after reset: M contrib/pg_stat_statements/Makefile M contrib/pg_stat_statements/meson.build M contrib/pg_stat_statements/pg_stat_statements.c M contrib/pg_stat_statements/pg_stat_statements.control M doc/src/sgml/pgstatstatements.sgml Removing contrib/pg_stat_statements/Makefile.rej Removing contrib/pg_stat_statements/expected/last_executed.out Removing contrib/pg_stat_statements/meson.build.rej Removing contrib/pg_stat_statements/pg_stat_statements--1.13--1.14.sql Removing contrib/pg_stat_statements/sql/last_executed.sql === using 'git apply' to apply patch ./0001-pg_stat_statements_last_executed.patch === /work/patches/./0001-pg_stat_statements_last_executed.patch:420: trailing whitespace. SELECT /work/patches/./0001-pg_stat_statements_last_executed.patch:434: trailing whitespace. SELECT /work/patches/./0001-pg_stat_statements_last_executed.patch:452: trailing whitespace. SELECT Applied patch to 'contrib/pg_stat_statements/Makefile' with conflicts. Falling back to direct application... Applied patch to 'contrib/pg_stat_statements/meson.build' with conflicts. Falling back to direct application... Applied patch to 'contrib/pg_stat_statements/pg_stat_statements.c' cleanly. Applied patch to 'contrib/pg_stat_statements/pg_stat_statements.control' cleanly. Falling back to direct application... Applied patch to 'doc/src/sgml/pgstatstatements.sgml' cleanly. U contrib/pg_stat_statements/Makefile U contrib/pg_stat_statements/meson.build warning: 3 lines add whitespace errors. diff --cc contrib/pg_stat_statements/Makefile index c27e9529bb6,518030d2188..00000000000 --- a/contrib/pg_stat_statements/Makefile +++ b/contrib/pg_stat_statements/Makefile @@@ -19,26 -20,9 +20,32 @@@ PGFILEDESC = "pg_stat_statements - exec LDFLAGS_SL += $(filter -lm, $(LIBS)) REGRESS_OPTS = --temp-config $(top_srcdir)/contrib/pg_stat_statements/pg_stat_statements.conf ++<<<<<<< ours + +# Note: Test "cleanup" is kept second to last, removing the extension. +REGRESS = \ + select \ + dml \ + cursors \ + utility \ + level_tracking \ + planning \ + user_activity \ + wal \ + entry_timestamp \ + privileges \ + extended \ + parallel \ + plancache \ + squashing \ + cleanup \ + oldextversions + ++======= + REGRESS = select dml cursors utility level_tracking planning \ + user_activity wal entry_timestamp privileges extended \ + parallel plancache cleanup oldextversions squashing last_executed ++>>>>>>> theirs # Disabled because these tests require "shared_preload_libraries=pg_stat_statements", # which typical installcheck users do not have (e.g. buildfarm clients). NO_INSTALLCHECK = 1 diff --cc contrib/pg_stat_statements/meson.build index 9d78cb88b7d,12760f9c3a1..00000000000 --- a/contrib/pg_stat_statements/meson.build +++ b/contrib/pg_stat_statements/meson.build @@@ -57,9 -57,10 +58,14 @@@ tests += 'extended', 'parallel', 'plancache', + 'squashing', 'cleanup', 'oldextversions', ++<<<<<<< ours ++======= + 'squashing', + 'last_executed', ++>>>>>>> theirs ], 'regress_args': ['--temp-config', files('pg_stat_statements.conf')], # Disabled because these tests require