=== Applying patches on top of PostgreSQL commit ID e5d25959cf8761c7dbdd7cfbb91338e94a40e8e2 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Sat Oct 3 14:41:30 UTC 2026 === expanding ./undo-v1.tgz x v1-0001-Add-a-cluster-wide-UNDO-engine-with-records-in-th.patch x v1-0002-Add-transactional-filesystem-operations-FILEOPS-b.patch x v1-0003-Route-filesystem-mutations-through-FILEOPS.patch x v1-0004-Add-per-backend-UNDO-logs.patch x v1-0005-Add-the-ATM-sLog-and-logical-revert-worker.patch x v1-0006-nbtree-mark-aborted-index-inserts-dead-via-UNDO.patch x v1-0007-hash-mark-aborted-index-inserts-dead-via-UNDO.patch x v1-0008-nbtree-support-in-place-delete-marking-for-stable.patch x v1-0009-Add-the-FLUX-in-place-MVCC-table-access-method.patch x FILEOPS-Design.mediawiki x FLUX-Design.mediawiki x UNDO-Design.mediawiki On branch cf/7389 nothing to commit, working tree clean === using 'git am' to apply patch ./v1-0001-Add-a-cluster-wide-UNDO-engine-with-records-in-th.patch === Applying: Add a cluster-wide UNDO engine with records in the WAL stream === using 'git am' to apply patch ./v1-0002-Add-transactional-filesystem-operations-FILEOPS-b.patch === Applying: Add transactional filesystem operations (FILEOPS) backed by UNDO === using 'git am' to apply patch ./v1-0003-Route-filesystem-mutations-through-FILEOPS.patch === Applying: Route filesystem mutations through FILEOPS === using 'git am' to apply patch ./v1-0004-Add-per-backend-UNDO-logs.patch === Applying: Add per-backend UNDO logs === using 'git am' to apply patch ./v1-0005-Add-the-ATM-sLog-and-logical-revert-worker.patch === Applying: Add the ATM, sLog, and logical revert worker === using 'git am' to apply patch ./v1-0006-nbtree-mark-aborted-index-inserts-dead-via-UNDO.patch === Applying: nbtree: mark aborted index inserts dead via UNDO === using 'git am' to apply patch ./v1-0007-hash-mark-aborted-index-inserts-dead-via-UNDO.patch === Applying: hash: mark aborted index inserts dead via UNDO === using 'git am' to apply patch ./v1-0008-nbtree-support-in-place-delete-marking-for-stable.patch === Applying: nbtree: support in-place delete-marking for stable-TID UPDATE === using 'git am' to apply patch ./v1-0009-Add-the-FLUX-in-place-MVCC-table-access-method.patch === Applying: Add the FLUX in-place-MVCC table access method error: sha1 information is lacking or useless (src/tools/pgindent/typedefs.list). error: could not build fake ancestor hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 Add the FLUX in-place-MVCC table access method 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-0009-Add-the-FLUX-in-place-MVCC-table-access-method.patch === patching file meson.build patching file src/Makefile.global.in patching file src/backend/access/Makefile patching file src/backend/access/flux/Makefile patching file src/backend/access/flux/README patching file src/backend/access/flux/flux_dirtymap.c patching file src/backend/access/flux/flux_fsm.c patching file src/backend/access/flux/flux_handler.c patching file src/backend/access/flux/flux_lock.c patching file src/backend/access/flux/flux_mvcc.c patching file src/backend/access/flux/flux_operations.c patching file src/backend/access/flux/flux_pbu.c patching file src/backend/access/flux/flux_pvs.c patching file src/backend/access/flux/flux_slot.c patching file src/backend/access/flux/flux_stats.c patching file src/backend/access/flux/flux_tuple.c patching file src/backend/access/flux/flux_undo.c patching file src/backend/access/flux/flux_vm.c patching file src/backend/access/flux/flux_xlog.c patching file src/backend/access/flux/meson.build patching file src/backend/access/meson.build patching file src/backend/access/rmgrdesc/Makefile patching file src/backend/access/rmgrdesc/fluxdesc.c patching file src/backend/access/rmgrdesc/meson.build patching file src/backend/access/transam/rmgr.c patching file src/backend/access/transam/twophase_rmgr.c patching file src/backend/commands/trigger.c Hunk #7 succeeded at 4483 (offset -23 lines). Hunk #8 succeeded at 4868 (offset -23 lines). Hunk #9 succeeded at 5460 (offset -60 lines). Hunk #10 succeeded at 6289 (offset -102 lines). Hunk #11 succeeded at 6469 (offset -102 lines). Hunk #12 succeeded at 6702 (offset -102 lines). patching file src/backend/executor/execReplication.c Hunk #1 succeeded at 969 (offset 21 lines). Hunk #2 succeeded at 1007 (offset 21 lines). patching file src/backend/executor/nodeModifyTable.c patching file src/backend/replication/logical/decode.c patching file src/backend/utils/misc/guc_parameters.dat patching file src/backend/utils/misc/guc_tables.c patching file src/bin/pg_waldump/rmgrdesc.c patching file src/bin/pg_waldump/t/001_basic.pl patching file src/include/access/flux.h patching file src/include/access/flux_dirtymap.h patching file src/include/access/flux_pbu.h patching file src/include/access/flux_undo.h patching file src/include/access/flux_xlog.h patching file src/include/access/rmgrlist.h patching file src/include/access/tableam.h patching file src/include/access/twophase_rmgr.h patching file src/include/access/undormgrlist.h 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_am.dat patching file src/include/catalog/pg_proc.dat patching file src/include/commands/trigger.h patching file src/include/nodes/tidbitmap.h patching file src/include/storage/subsystemlist.h patching file src/test/isolation/expected/flux_conflict.out patching file src/test/isolation/expected/flux_inplace.out patching file src/test/isolation/expected/flux_lostupdate.out patching file src/test/isolation/isolation_schedule patching file src/test/isolation/specs/flux_conflict.spec patching file src/test/isolation/specs/flux_inplace.spec patching file src/test/isolation/specs/flux_lostupdate.spec patching file src/test/modules/test_idxundo/expected/test_idxundo.out patching file src/test/modules/test_idxundo/sql/test_idxundo.sql patching file src/test/regress/expected/create_am.out patching file src/test/regress/expected/flux.out patching file src/test/regress/expected/psql.out patching file src/test/regress/parallel_schedule patching file src/test/regress/sql/flux.sql patching file src/test/subscription/meson.build patching file src/test/subscription/t/101_inplace_am_logicalrep.pl patching file src/tools/pgindent/typedefs.list Hunk #2 succeeded at 851 (offset -2 lines). Hunk #3 succeeded at 1311 (offset -2 lines). Hunk #4 succeeded at 3627 (offset -4 lines). Unstaged changes after reset: M meson.build M src/Makefile.global.in M src/backend/access/Makefile M src/backend/access/meson.build M src/backend/access/rmgrdesc/Makefile M src/backend/access/rmgrdesc/meson.build M src/backend/access/transam/rmgr.c M src/backend/access/transam/twophase_rmgr.c M src/backend/commands/trigger.c M src/backend/executor/execReplication.c M src/backend/executor/nodeModifyTable.c M src/backend/replication/logical/decode.c M src/backend/utils/misc/guc_parameters.dat M src/backend/utils/misc/guc_tables.c M src/bin/pg_waldump/rmgrdesc.c M src/bin/pg_waldump/t/001_basic.pl M src/include/access/rmgrlist.h M src/include/access/tableam.h M src/include/access/twophase_rmgr.h M src/include/access/undormgrlist.h M src/include/catalog/pg_am.dat M src/include/catalog/pg_proc.dat M src/include/commands/trigger.h M src/include/nodes/tidbitmap.h M src/include/storage/subsystemlist.h M src/test/isolation/isolation_schedule M src/test/modules/test_idxundo/expected/test_idxundo.out M src/test/modules/test_idxundo/sql/test_idxundo.sql M src/test/regress/expected/create_am.out M src/test/regress/expected/psql.out M src/test/regress/parallel_schedule M src/test/subscription/meson.build M src/tools/pgindent/typedefs.list Removing src/backend/access/flux/ Removing src/backend/access/rmgrdesc/fluxdesc.c Removing src/include/access/flux.h Removing src/include/access/flux_dirtymap.h Removing src/include/access/flux_pbu.h Removing src/include/access/flux_undo.h Removing src/include/access/flux_xlog.h Removing src/include/catalog/catversion.h.rej Removing src/test/isolation/expected/flux_conflict.out Removing src/test/isolation/expected/flux_inplace.out Removing src/test/isolation/expected/flux_lostupdate.out Removing src/test/isolation/specs/flux_conflict.spec Removing src/test/isolation/specs/flux_inplace.spec Removing src/test/isolation/specs/flux_lostupdate.spec Removing src/test/regress/expected/flux.out Removing src/test/regress/sql/flux.sql Removing src/test/subscription/t/101_inplace_am_logicalrep.pl === using 'git apply' to apply patch ./v1-0009-Add-the-FLUX-in-place-MVCC-table-access-method.patch === Applied patch to 'meson.build' cleanly. Applied patch to 'src/Makefile.global.in' cleanly. Applied patch to 'src/backend/access/Makefile' cleanly. Falling back to direct application... Falling back to direct application... Falling back to direct application... Falling back to direct application... Falling back to direct application... Falling back to direct application... Falling back to direct application... Falling back to direct application... Falling back to direct application... Falling back to direct application... Falling back to direct application... Falling back to direct application... Falling back to direct application... Falling back to direct application... Falling back to direct application... Falling back to direct application... Falling back to direct application... Applied patch to 'src/backend/access/meson.build' cleanly. Applied patch to 'src/backend/access/rmgrdesc/Makefile' cleanly. Falling back to direct application... Applied patch to 'src/backend/access/rmgrdesc/meson.build' cleanly. Applied patch to 'src/backend/access/transam/rmgr.c' cleanly. Applied patch to 'src/backend/access/transam/twophase_rmgr.c' cleanly. Applied patch to 'src/backend/commands/trigger.c' cleanly. Applied patch to 'src/backend/executor/execReplication.c' cleanly. Applied patch to 'src/backend/executor/nodeModifyTable.c' cleanly. Applied patch to 'src/backend/replication/logical/decode.c' cleanly. Applied patch to 'src/backend/utils/misc/guc_parameters.dat' cleanly. Applied patch to 'src/backend/utils/misc/guc_tables.c' cleanly. Applied patch to 'src/bin/pg_waldump/rmgrdesc.c' cleanly. Applied patch to 'src/bin/pg_waldump/t/001_basic.pl' cleanly. Falling back to direct application... Falling back to direct application... Falling back to direct application... Falling back to direct application... Falling back to direct application... Applied patch to 'src/include/access/rmgrlist.h' cleanly. Applied patch to 'src/include/access/tableam.h' cleanly. Applied patch to 'src/include/access/twophase_rmgr.h' cleanly. Applied patch to 'src/include/access/undormgrlist.h' cleanly. Applied patch to 'src/include/catalog/catversion.h' with conflicts. Applied patch to 'src/include/catalog/pg_am.dat' cleanly. Applied patch to 'src/include/catalog/pg_proc.dat' cleanly. Applied patch to 'src/include/commands/trigger.h' cleanly. Applied patch to 'src/include/nodes/tidbitmap.h' cleanly. Applied patch to 'src/include/storage/subsystemlist.h' cleanly. Falling back to direct application... Falling back to direct application... Falling back to direct application... Applied patch to 'src/test/isolation/isolation_schedule' cleanly. Falling back to direct application... Falling back to direct application... Falling back to direct application... Applied patch to 'src/test/modules/test_idxundo/expected/test_idxundo.out' cleanly. Applied patch to 'src/test/modules/test_idxundo/sql/test_idxundo.sql' cleanly. Applied patch to 'src/test/regress/expected/create_am.out' cleanly. Falling back to direct application... Applied patch to 'src/test/regress/expected/psql.out' cleanly. Applied patch to 'src/test/regress/parallel_schedule' cleanly. Falling back to direct application... Applied patch to 'src/test/subscription/meson.build' cleanly. Falling back to direct application... error: repository lacks the necessary blob to perform 3-way merge. Falling back to direct application... U src/include/catalog/catversion.h diff --cc src/include/catalog/catversion.h index 7f7667f6179,cb9466c1e8c..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 202610021 ++======= + #define CATALOG_VERSION_NO 202609153 ++>>>>>>> theirs #endif