=== Applying patches on top of PostgreSQL commit ID d8d7c5dc8f74506d35c7e8242be997fd5cf388eb ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Fri Feb  6 20:56:44 UTC 2026
On branch cf/6136
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v3-0001-pg_stat_statements-add-ability-to-filter-statisti.patch ===
Applying: pg_stat_statements: add ability to filter statistics while sacnning pgss_hash
Using index info to reconstruct a base tree...
M	contrib/pg_stat_statements/Makefile
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/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 pg_stat_statements: add ability to filter statistics while sacnning pgss_hash
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/pg_stat_statements--1.12--1.13.sql
M	contrib/pg_stat_statements/pg_stat_statements.c
Removing contrib/pg_stat_statements/expected/filtering.out
Removing contrib/pg_stat_statements/sql/filtering.sql
=== using patch(1) to apply patch ./v3-0001-pg_stat_statements-add-ability-to-filter-statisti.patch ===
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/filtering.out
patching file contrib/pg_stat_statements/pg_stat_statements--1.12--1.13.sql
patching file contrib/pg_stat_statements/pg_stat_statements.c
patching file contrib/pg_stat_statements/sql/filtering.sql
Unstaged changes after reset:
M	contrib/pg_stat_statements/pg_stat_statements--1.12--1.13.sql
M	contrib/pg_stat_statements/pg_stat_statements.c
Removing contrib/pg_stat_statements/Makefile.rej
Removing contrib/pg_stat_statements/expected/filtering.out
Removing contrib/pg_stat_statements/sql/filtering.sql
=== using 'git apply' to apply patch ./v3-0001-pg_stat_statements-add-ability-to-filter-statisti.patch ===
Applied patch to 'contrib/pg_stat_statements/Makefile' with conflicts.
Falling back to direct application...
Applied patch to 'contrib/pg_stat_statements/pg_stat_statements--1.12--1.13.sql' cleanly.
Applied patch to 'contrib/pg_stat_statements/pg_stat_statements.c' cleanly.
Falling back to direct application...
U contrib/pg_stat_statements/Makefile
diff --cc contrib/pg_stat_statements/Makefile
index c27e9529bb6,59858086b69..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 filtering cleanup oldextversions squashing
++>>>>>>> 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