=== Applying patches on top of PostgreSQL commit ID 81b2179b492e3af891544813b7e22a42386b34d0 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Sun Nov 15 09:04:30 UTC 2026 On branch cf/6341 nothing to commit, working tree clean === using 'git am' to apply patch ./v4-0001-Clean-up-PREPARE-query-strings-in-multi-statement.patch === Applying: Clean up PREPARE query strings in multi-statement contexts Using index info to reconstruct a base tree... M contrib/auto_explain/t/001_auto_explain.pl M contrib/pg_stat_statements/Makefile M contrib/pg_stat_statements/meson.build M src/backend/commands/prepare.c Falling back to patching base and 3-way merge... Auto-merging src/backend/commands/prepare.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 Auto-merging contrib/auto_explain/t/001_auto_explain.pl error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 Clean up PREPARE query strings in multi-statement contexts 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 ./v4-0001-Clean-up-PREPARE-query-strings-in-multi-statement.patch === patching file contrib/auto_explain/t/001_auto_explain.pl patching file contrib/pg_stat_statements/Makefile Hunk #1 FAILED at 36. 1 out of 1 hunk FAILED -- saving rejects to file contrib/pg_stat_statements/Makefile.rej patching file contrib/pg_stat_statements/expected/prepare.out patching file contrib/pg_stat_statements/meson.build Hunk #1 FAILED at 58. 1 out of 1 hunk FAILED -- saving rejects to file contrib/pg_stat_statements/meson.build.rej patching file contrib/pg_stat_statements/sql/prepare.sql patching file src/backend/commands/prepare.c Hunk #2 succeeded at 67 (offset 2 lines). Hunk #3 succeeded at 87 (offset 2 lines). Hunk #4 succeeded at 141 (offset 2 lines). patching file src/test/regress/expected/prepare.out patching file src/test/regress/sql/prepare.sql Unstaged changes after reset: M contrib/auto_explain/t/001_auto_explain.pl M src/backend/commands/prepare.c M src/test/regress/expected/prepare.out M src/test/regress/sql/prepare.sql Removing contrib/pg_stat_statements/Makefile.rej Removing contrib/pg_stat_statements/expected/prepare.out Removing contrib/pg_stat_statements/meson.build.rej Removing contrib/pg_stat_statements/sql/prepare.sql === using 'git apply' to apply patch ./v4-0001-Clean-up-PREPARE-query-strings-in-multi-statement.patch === Applied patch to 'contrib/auto_explain/t/001_auto_explain.pl' cleanly. 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 'src/backend/commands/prepare.c' cleanly. Applied patch to 'src/test/regress/expected/prepare.out' cleanly. Applied patch to 'src/test/regress/sql/prepare.sql' cleanly. U contrib/pg_stat_statements/Makefile U contrib/pg_stat_statements/meson.build diff --cc contrib/pg_stat_statements/Makefile index 2fe2a077ade,ac967687796..00000000000 --- a/contrib/pg_stat_statements/Makefile +++ b/contrib/pg_stat_statements/Makefile @@@ -36,7 -36,7 +36,11 @@@ REGRESS = parallel \ plancache \ squashing \ ++<<<<<<< ours + sqljson \ ++======= + prepare \ ++>>>>>>> theirs cleanup \ oldextversions diff --cc contrib/pg_stat_statements/meson.build index a2f957836aa,c9e1d446d39..00000000000 --- a/contrib/pg_stat_statements/meson.build +++ b/contrib/pg_stat_statements/meson.build @@@ -58,7 -58,7 +58,11 @@@ tests += 'parallel', 'plancache', 'squashing', ++<<<<<<< ours + 'sqljson', ++======= + 'prepare', ++>>>>>>> theirs 'cleanup', 'oldextversions', ],