=== Applying patches on top of PostgreSQL commit ID 6b9f40d49ae33eb0b4a7c77666fe4971ef7ba087 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Wed Oct 21 11:46:34 UTC 2026 On branch cf/5012 nothing to commit, working tree clean === using 'git am' to apply patch ./v47-0001-Report-per-index-removed-tuples-in-vacuum-instru.patch === Applying: Report per-index removed tuples in vacuum instrumentation. === using 'git am' to apply patch ./v47-0002-Track-vacuum-times-for-indexes-and-databases-and.patch === Applying: Track vacuum times for indexes and databases, and vacuum delay, in pg_stat views. Using index info to reconstruct a base tree... M doc/src/sgml/monitoring.sgml M src/backend/commands/vacuum.c M src/backend/commands/vacuumparallel.c M src/include/catalog/catversion.h M src/include/catalog/pg_proc.dat 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/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/commands/vacuumparallel.c Auto-merging src/backend/commands/vacuum.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 Track vacuum times for indexes and databases, and vacuum delay, in pg_stat views. 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 ./v47-0002-Track-vacuum-times-for-indexes-and-databases-and.patch === patching file doc/src/sgml/monitoring.sgml Hunk #1 succeeded at 4249 (offset 6 lines). Hunk #2 succeeded at 4639 (offset 6 lines). Hunk #3 succeeded at 4896 (offset 6 lines). patching file src/backend/access/heap/vacuumlazy.c patching file src/backend/catalog/system_views.sql patching file src/backend/commands/vacuum.c Hunk #2 succeeded at 2576 (offset 3 lines). patching file src/backend/commands/vacuumparallel.c Hunk #2 succeeded at 1123 (offset 1 line). Hunk #3 succeeded at 1182 (offset 1 line). patching file src/backend/utils/activity/pgstat_database.c patching file src/backend/utils/activity/pgstat_index.c patching file src/backend/utils/activity/pgstat_relation.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/commands/vacuum.h patching file src/include/pgstat.h patching file src/test/modules/test_misc/meson.build patching file src/test/modules/test_misc/t/016_index_vacuum_time.pl patching file src/test/regress/expected/rules.out Unstaged changes after reset: M doc/src/sgml/monitoring.sgml M src/backend/access/heap/vacuumlazy.c M src/backend/catalog/system_views.sql M src/backend/commands/vacuum.c M src/backend/commands/vacuumparallel.c M src/backend/utils/activity/pgstat_database.c M src/backend/utils/activity/pgstat_index.c M src/backend/utils/activity/pgstat_relation.c M src/backend/utils/adt/pgstatfuncs.c M src/include/catalog/pg_proc.dat M src/include/commands/vacuum.h M src/include/pgstat.h M src/test/modules/test_misc/meson.build M src/test/regress/expected/rules.out Removing src/include/catalog/catversion.h.rej Removing src/test/modules/test_misc/t/016_index_vacuum_time.pl === using 'git apply' to apply patch ./v47-0002-Track-vacuum-times-for-indexes-and-databases-and.patch === Applied patch to 'doc/src/sgml/monitoring.sgml' cleanly. Applied patch to 'src/backend/access/heap/vacuumlazy.c' cleanly. Applied patch to 'src/backend/catalog/system_views.sql' cleanly. Applied patch to 'src/backend/commands/vacuum.c' cleanly. Applied patch to 'src/backend/commands/vacuumparallel.c' cleanly. Applied patch to 'src/backend/utils/activity/pgstat_database.c' cleanly. Applied patch to 'src/backend/utils/activity/pgstat_index.c' cleanly. Applied patch to 'src/backend/utils/activity/pgstat_relation.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/commands/vacuum.h' cleanly. Applied patch to 'src/include/pgstat.h' cleanly. Applied patch to 'src/test/modules/test_misc/meson.build' cleanly. Falling back to direct application... Applied patch to 'src/test/regress/expected/rules.out' cleanly. U src/include/catalog/catversion.h diff --cc src/include/catalog/catversion.h index 056d48eb279,dff619a9906..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 202610201 ++======= + #define CATALOG_VERSION_NO 202610140 ++>>>>>>> theirs #endif