=== Applying patches on top of PostgreSQL commit ID 1572ea96e65731eee3227fbc3c119bd9f39e8e50 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Wed Jan 21 12:23:20 UTC 2026
On branch cf/6341
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v2-0001-Cleanup-explicit-PREPARE-query-strings.patch ===
Applying: Cleanup explicit PREPARE query strings
Using index info to reconstruct a base tree...
M	contrib/pg_stat_statements/Makefile
M	contrib/pg_stat_statements/meson.build
Falling back to patching base and 3-way merge...
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 Cleanup explicit PREPARE query strings
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/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
M	src/test/regress/expected/prepare.out
M	src/test/regress/sql/prepare.sql
Removing contrib/pg_stat_statements/expected/prepare.out
Removing contrib/pg_stat_statements/sql/prepare.sql
=== using patch(1) to apply patch ./v2-0001-Cleanup-explicit-PREPARE-query-strings.patch ===
patching file contrib/auto_explain/t/001_auto_explain.pl
patching file contrib/pg_stat_statements/Makefile
Hunk #1 FAILED at 21.
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 59.
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
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 ./v2-0001-Cleanup-explicit-PREPARE-query-strings.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 c27e9529bb6,9a6bda90070..00000000000
--- a/contrib/pg_stat_statements/Makefile
+++ b/contrib/pg_stat_statements/Makefile
@@@ -19,26 -19,9 +19,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 prepare
++>>>>>>> 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,65258651bd2..00000000000
--- a/contrib/pg_stat_statements/meson.build
+++ b/contrib/pg_stat_statements/meson.build
@@@ -57,9 -56,10 +57,14 @@@ tests += 
        'extended',
        'parallel',
        'plancache',
 +      'squashing',
        'cleanup',
        'oldextversions',
++<<<<<<< ours
++=======
+       'squashing',
+       'prepare',
++>>>>>>> theirs
      ],
      'regress_args': ['--temp-config', files('pg_stat_statements.conf')],
      # Disabled because these tests require