=== Applying patches on top of PostgreSQL commit ID f0178deecbb56283fda8f4c504c8fe16ce23e1a6 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Thu Aug  6 14:19:31 UTC 2026
On branch cf/6835
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v2-0001-Add-temp-table-monitoring-columns-to-pg_stat_data.patch ===
Applying: Add temp table monitoring columns to pg_stat_database
Using index info to reconstruct a base tree...
M	doc/src/sgml/monitoring.sgml
M	src/backend/catalog/system_views.sql
M	src/backend/storage/buffer/bufmgr.c
M	src/backend/utils/adt/pgstatfuncs.c
M	src/include/catalog/catversion.h
M	src/include/catalog/pg_proc.dat
M	src/include/pgstat.h
M	src/test/regress/expected/rules.out
Falling back to patching base and 3-way merge...
Auto-merging src/test/regress/expected/rules.out
Auto-merging src/include/pgstat.h
Auto-merging src/include/catalog/pg_proc.dat
Auto-merging src/include/catalog/catversion.h
CONFLICT (content): Merge conflict in src/include/catalog/catversion.h
Auto-merging src/backend/utils/adt/pgstatfuncs.c
Auto-merging src/backend/storage/buffer/bufmgr.c
Auto-merging src/backend/catalog/system_views.sql
Auto-merging doc/src/sgml/monitoring.sgml
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 temp table monitoring columns to pg_stat_database
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 ./v2-0001-Add-temp-table-monitoring-columns-to-pg_stat_data.patch ===
patching file doc/src/sgml/monitoring.sgml
Hunk #1 succeeded at 4176 (offset 296 lines).
patching file src/backend/catalog/heap.c
patching file src/backend/catalog/system_views.sql
patching file src/backend/storage/buffer/bufmgr.c
patching file src/backend/storage/buffer/localbuf.c
patching file src/backend/utils/activity/pgstat_database.c
patching file src/backend/utils/adt/pgstatfuncs.c
patching file src/include/catalog/catversion.h
Hunk #1 FAILED at 57.
1 out of 1 hunk FAILED -- saving rejects to file src/include/catalog/catversion.h.rej
patching file src/include/catalog/pg_proc.dat
Hunk #1 succeeded at 5918 (offset -3 lines).
patching file src/include/pgstat.h
Hunk #2 succeeded at 667 (offset 13 lines).
patching file src/test/regress/expected/rules.out
Unstaged changes after reset:
M	doc/src/sgml/monitoring.sgml
M	src/backend/catalog/heap.c
M	src/backend/catalog/system_views.sql
M	src/backend/storage/buffer/bufmgr.c
M	src/backend/storage/buffer/localbuf.c
M	src/backend/utils/activity/pgstat_database.c
M	src/backend/utils/adt/pgstatfuncs.c
M	src/include/catalog/pg_proc.dat
M	src/include/pgstat.h
M	src/test/regress/expected/rules.out
Removing src/include/catalog/catversion.h.rej
=== using 'git apply' to apply patch ./v2-0001-Add-temp-table-monitoring-columns-to-pg_stat_data.patch ===
Applied patch to 'doc/src/sgml/monitoring.sgml' cleanly.
Applied patch to 'src/backend/catalog/heap.c' cleanly.
Applied patch to 'src/backend/catalog/system_views.sql' cleanly.
Applied patch to 'src/backend/storage/buffer/bufmgr.c' cleanly.
Applied patch to 'src/backend/storage/buffer/localbuf.c' cleanly.
Applied patch to 'src/backend/utils/activity/pgstat_database.c' cleanly.
Applied patch to 'src/backend/utils/adt/pgstatfuncs.c' cleanly.
Applied patch to 'src/include/catalog/catversion.h' with conflicts.
Applied patch to 'src/include/catalog/pg_proc.dat' cleanly.
Applied patch to 'src/include/pgstat.h' cleanly.
Applied patch to 'src/test/regress/expected/rules.out' cleanly.
U src/include/catalog/catversion.h
diff --cc src/include/catalog/catversion.h
index f20ea73ed39,13ac17567ef..00000000000
--- a/src/include/catalog/catversion.h
+++ b/src/include/catalog/catversion.h
@@@ -57,6 -57,6 +57,10 @@@
   */
  
  /*							yyyymmddN */
++<<<<<<< ours
 +#define CATALOG_VERSION_NO	202607273
++=======
+ #define CATALOG_VERSION_NO	202606241
++>>>>>>> theirs
  
  #endif