=== Applying patches on top of PostgreSQL commit ID 419ce13b7019f906ebc010af3be09a9deffc2a47 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Wed Jun 24 05:03:26 UTC 2026 On branch cf/6885 nothing to commit, working tree clean === using 'git am' to apply patch ./v1-0001-Change-wait_time-column-of-pg_stat_lock-to-double.patch === Applying: Change wait_time column of pg_stat_lock to double precision Using index info to reconstruct a base tree... M src/include/catalog/catversion.h M src/include/catalog/pg_proc.dat Falling back to patching base and 3-way merge... 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 error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 Change wait_time column of pg_stat_lock to double precision 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-Change-wait_time-column-of-pg_stat_lock-to-double.patch === patching file doc/src/sgml/monitoring.sgml patching file src/backend/storage/lmgr/proc.c patching file src/backend/utils/activity/pgstat_lock.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/storage/lmgr/proc.c M src/backend/utils/activity/pgstat_lock.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-Change-wait_time-column-of-pg_stat_lock-to-double.patch === Applied patch to 'doc/src/sgml/monitoring.sgml' cleanly. Applied patch to 'src/backend/storage/lmgr/proc.c' cleanly. Applied patch to 'src/backend/utils/activity/pgstat_lock.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 04eb2af2ac8,7f31a8a1548..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 202606232 ++======= + #define CATALOG_VERSION_NO 202606151 ++>>>>>>> theirs #endif