=== Applying patches on top of PostgreSQL commit ID ae3df4b34155d4a3811762e78d5076e64df66fba ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sun Mar 30 23:15:21 UTC 2025
On branch cf/5634
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v4-0001-add-plan_cache-counters-to-pg_stat_statements.patch ===
Applying: add plan_cache counters to pg_stat_statements.
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
M	doc/src/sgml/pgstatstatements.sgml
M	src/include/utils/plancache.h
Falling back to patching base and 3-way merge...
Auto-merging src/include/utils/plancache.h
Auto-merging doc/src/sgml/pgstatstatements.sgml
Auto-merging contrib/pg_stat_statements/pg_stat_statements.c
Auto-merging 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 plan_cache counters 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
M	src/backend/utils/cache/plancache.c
M	src/include/utils/plancache.h
Removing contrib/pg_stat_statements/expected/plan_cache.out
Removing contrib/pg_stat_statements/pg_stat_statements--1.12--1.13.sql
Removing contrib/pg_stat_statements/sql/plan_cache.sql
=== using patch(1) to apply patch ./v4-0001-add-plan_cache-counters-to-pg_stat_statements.patch ===
patch: unrecognized option `--no-backup-if-mismatch'
usage: patch [-bCcEeflNnRstuv] [-B backup-prefix] [-D symbol] [-d directory]
             [-F max-fuzz] [-i patchfile] [-o out-file] [-p strip-count]
             [-r rej-name] [-V t | nil | never | none] [-x number]
             [-z backup-ext] [--posix] [origfile [patchfile]]
       patch <patchfile
=== using 'git apply' to apply patch ./v4-0001-add-plan_cache-counters-to-pg_stat_statements.patch ===
Applied patch to 'contrib/pg_stat_statements/Makefile' with conflicts.
Falling back to direct application...
Applied patch to 'contrib/pg_stat_statements/meson.build' cleanly.
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.
Applied patch to 'src/backend/utils/cache/plancache.c' cleanly.
Applied patch to 'src/include/utils/plancache.h' cleanly.
U contrib/pg_stat_statements/Makefile
diff --cc contrib/pg_stat_statements/Makefile
index b2bd8794d2a,bb812565480..00000000000
--- a/contrib/pg_stat_statements/Makefile
+++ b/contrib/pg_stat_statements/Makefile
@@@ -20,7 -21,7 +21,11 @@@ LDFLAGS_SL += $(filter -lm, $(LIBS)
  REGRESS_OPTS = --temp-config $(top_srcdir)/contrib/pg_stat_statements/pg_stat_statements.conf
  REGRESS = select dml cursors utility level_tracking planning \
  	user_activity wal entry_timestamp privileges extended \
++<<<<<<< ours
 +	parallel cleanup oldextversions squashing
++=======
+ 	parallel plan_cache cleanup oldextversions
++>>>>>>> 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