=== Applying patches on top of PostgreSQL commit ID 5174d157a0381876cb1c6c5903c1844669d5bbc2 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Wed Jul 15 22:10:31 UTC 2026
On branch cf/6606
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v1-0001-Add-WAL-segment-file-counts-to-pg_stat_checkpointer.patch ===
Applying: Add WAL segment file counts to pg_stat_checkpointer
Using index info to reconstruct a base tree...
M	doc/src/sgml/monitoring.sgml
M	src/backend/access/transam/xlog.c
M	src/backend/catalog/system_views.sql
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
Falling back to patching base and 3-way merge...
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/catalog/system_views.sql
Auto-merging src/backend/access/transam/xlog.c
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 WAL segment file counts to pg_stat_checkpointer
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 ./v1-0001-Add-WAL-segment-file-counts-to-pg_stat_checkpointer.patch ===
patching file doc/src/sgml/monitoring.sgml
Hunk #1 succeeded at 3593 (offset 6 lines).
patching file src/backend/access/transam/xlog.c
Hunk #1 succeeded at 7208 (offset 3 lines).
patching file src/backend/catalog/system_views.sql
patching file src/backend/utils/activity/pgstat_checkpointer.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
patching file src/include/pgstat.h
Unstaged changes after reset:
M	doc/src/sgml/monitoring.sgml
M	src/backend/access/transam/xlog.c
M	src/backend/catalog/system_views.sql
M	src/backend/utils/activity/pgstat_checkpointer.c
M	src/backend/utils/adt/pgstatfuncs.c
M	src/include/catalog/pg_proc.dat
M	src/include/pgstat.h
Removing src/include/catalog/catversion.h.rej
=== using 'git apply' to apply patch ./v1-0001-Add-WAL-segment-file-counts-to-pg_stat_checkpointer.patch ===
Applied patch to 'doc/src/sgml/monitoring.sgml' cleanly.
Applied patch to 'src/backend/access/transam/xlog.c' cleanly.
Applied patch to 'src/backend/catalog/system_views.sql' cleanly.
Applied patch to 'src/backend/utils/activity/pgstat_checkpointer.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.
U src/include/catalog/catversion.h
diff --cc src/include/catalog/catversion.h
index ba4e2b4d908,234142d0e3d..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	202607091
++=======
+ #define CATALOG_VERSION_NO	202605161
++>>>>>>> theirs
  
  #endif