=== Applying patches on top of PostgreSQL commit ID 4d5fdb21ddda46972d7703562c5ad4076feae8b8 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Fri Aug 28 19:20:32 UTC 2026 On branch cf/7167 nothing to commit, working tree clean === using 'git am' to apply patch ./0001-Add-durable-unlogged-reset-generation-counter.patch === Applying: Add durable unlogged-reset generation counter === using 'git am' to apply patch ./0002-Replace-pg_class.relispopulated-with-epoch-capable-r.patch === Applying: Replace pg_class.relispopulated with epoch-capable relpopulated Using index info to reconstruct a base tree... M doc/src/sgml/catalogs.sgml M doc/src/sgml/func/func-info.sgml M src/bin/pg_dump/pg_dump.c 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 Auto-merging src/bin/pg_dump/pg_dump.c Auto-merging doc/src/sgml/func/func-info.sgml Auto-merging doc/src/sgml/catalogs.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 Replace pg_class.relispopulated with epoch-capable relpopulated 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 ./0002-Replace-pg_class.relispopulated-with-epoch-capable-r.patch === patching file doc/src/sgml/catalogs.sgml Hunk #1 succeeded at 2254 (offset 12 lines). Hunk #2 succeeded at 2317 (offset 12 lines). patching file doc/src/sgml/func/func-info.sgml patching file src/backend/catalog/heap.c patching file src/backend/catalog/system_views.sql patching file src/backend/commands/copyto.c patching file src/backend/commands/matview.c patching file src/backend/commands/repack.c patching file src/backend/executor/execUtils.c patching file src/backend/utils/adt/pg_upgrade_support.c patching file src/backend/utils/cache/relcache.c patching file src/bin/pg_dump/pg_dump.c Hunk #2 succeeded at 17835 (offset 14 lines). 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_class.h patching file src/include/catalog/pg_proc.dat patching file src/include/commands/matview.h patching file src/include/utils/rel.h patching file src/test/regress/expected/matview.out patching file src/test/regress/expected/rules.out patching file src/test/regress/sql/matview.sql Unstaged changes after reset: M doc/src/sgml/catalogs.sgml M doc/src/sgml/func/func-info.sgml M src/backend/catalog/heap.c M src/backend/catalog/system_views.sql M src/backend/commands/copyto.c M src/backend/commands/matview.c M src/backend/commands/repack.c M src/backend/executor/execUtils.c M src/backend/utils/adt/pg_upgrade_support.c M src/backend/utils/cache/relcache.c M src/bin/pg_dump/pg_dump.c M src/include/catalog/pg_class.h M src/include/catalog/pg_proc.dat M src/include/commands/matview.h M src/include/utils/rel.h M src/test/regress/expected/matview.out M src/test/regress/expected/rules.out M src/test/regress/sql/matview.sql Removing src/include/catalog/catversion.h.rej === using 'git apply' to apply patch ./0002-Replace-pg_class.relispopulated-with-epoch-capable-r.patch === Applied patch to 'doc/src/sgml/catalogs.sgml' cleanly. Applied patch to 'doc/src/sgml/func/func-info.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/commands/copyto.c' cleanly. Applied patch to 'src/backend/commands/matview.c' cleanly. Applied patch to 'src/backend/commands/repack.c' cleanly. Applied patch to 'src/backend/executor/execUtils.c' cleanly. Applied patch to 'src/backend/utils/adt/pg_upgrade_support.c' cleanly. Applied patch to 'src/backend/utils/cache/relcache.c' cleanly. Applied patch to 'src/bin/pg_dump/pg_dump.c' cleanly. Applied patch to 'src/include/catalog/catversion.h' with conflicts. Applied patch to 'src/include/catalog/pg_class.h' cleanly. Applied patch to 'src/include/catalog/pg_proc.dat' cleanly. Applied patch to 'src/include/commands/matview.h' cleanly. Applied patch to 'src/include/utils/rel.h' cleanly. Applied patch to 'src/test/regress/expected/matview.out' cleanly. Applied patch to 'src/test/regress/expected/rules.out' cleanly. Applied patch to 'src/test/regress/sql/matview.sql' cleanly. U src/include/catalog/catversion.h diff --cc src/include/catalog/catversion.h index f11e244899e,964b61957b5..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 202608271 ++======= + #define CATALOG_VERSION_NO 202608191 ++>>>>>>> theirs #endif