=== Applying patches on top of PostgreSQL commit ID 5ffc82103773eea1ab5aa699edc301d4f03de4ce === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Mon Nov 16 09:16:30 UTC 2026 On branch cf/7647 nothing to commit, working tree clean === using 'git am' to apply patch ./v1-0001-Account-for-failed-recovery-prefetch-advice.patch === Applying: Account for failed recovery prefetch advice 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 Account for failed recovery prefetch advice 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-Account-for-failed-recovery-prefetch-advice.patch === patching file doc/src/sgml/monitoring.sgml patching file src/backend/access/transam/xlogprefetcher.c patching file src/backend/catalog/system_views.sql patching file src/backend/storage/buffer/bufmgr.c patching file src/backend/storage/buffer/localbuf.c patching file src/backend/storage/smgr/md.c patching file src/backend/storage/smgr/smgr.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/storage/bufmgr.h patching file src/include/storage/md.h patching file src/include/storage/smgr.h patching file src/test/recovery/meson.build patching file src/test/recovery/t/061_recovery_prefetch.pl patching file src/test/regress/expected/rules.out Unstaged changes after reset: M doc/src/sgml/monitoring.sgml M src/backend/access/transam/xlogprefetcher.c M src/backend/catalog/system_views.sql M src/backend/storage/buffer/bufmgr.c M src/backend/storage/buffer/localbuf.c M src/backend/storage/smgr/md.c M src/backend/storage/smgr/smgr.c M src/include/catalog/pg_proc.dat M src/include/storage/bufmgr.h M src/include/storage/md.h M src/include/storage/smgr.h M src/test/recovery/meson.build M src/test/regress/expected/rules.out Removing src/include/catalog/catversion.h.rej Removing src/test/recovery/t/061_recovery_prefetch.pl === using 'git apply' to apply patch ./v1-0001-Account-for-failed-recovery-prefetch-advice.patch === Applied patch to 'doc/src/sgml/monitoring.sgml' cleanly. Applied patch to 'src/backend/access/transam/xlogprefetcher.c' cleanly. Applied patch to 'src/backend/catalog/system_views.sql' cleanly. Applied patch to 'src/backend/storage/buffer/bufmgr.c' cleanly. Applied patch to 'src/backend/storage/buffer/localbuf.c' cleanly. Applied patch to 'src/backend/storage/smgr/md.c' cleanly. Applied patch to 'src/backend/storage/smgr/smgr.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/storage/bufmgr.h' cleanly. Applied patch to 'src/include/storage/md.h' cleanly. Applied patch to 'src/include/storage/smgr.h' cleanly. Applied patch to 'src/test/recovery/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 9272a0cbaff,50cf7e94f17..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 202611121 ++======= + #define CATALOG_VERSION_NO 202611031 ++>>>>>>> theirs #endif