=== Applying patches on top of PostgreSQL commit ID 3cf5264557bee2ba848e5276beecc10571d468a6 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Thu Jul 16 08:20:30 UTC 2026 On branch cf/5957 nothing to commit, working tree clean === using 'git am' to apply patch ./v2-0001-Add-parser-support-for-CAST-FORMAT.patch === Applying: Add parser support for CAST ... FORMAT === using 'git am' to apply patch ./v2-0002-Add-pg_format_cast-and-CREATE-DROP-FORMAT-CAST.patch === Applying: Add pg_format_cast and CREATE/DROP FORMAT CAST error: sha1 information is lacking or useless (src/backend/parser/gram.y). error: could not build fake ancestor hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 Add pg_format_cast and CREATE/DROP FORMAT CAST 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 ./v2-0002-Add-pg_format_cast-and-CREATE-DROP-FORMAT-CAST.patch === patching file doc/src/sgml/catalogs.sgml patching file doc/src/sgml/ref/allfiles.sgml patching file doc/src/sgml/ref/alter_extension.sgml patching file doc/src/sgml/ref/comment.sgml patching file doc/src/sgml/ref/create_format_cast.sgml patching file doc/src/sgml/ref/drop_format_cast.sgml patching file doc/src/sgml/reference.sgml patching file src/backend/catalog/aclchk.c patching file src/backend/catalog/dependency.c patching file src/backend/catalog/objectaddress.c Hunk #11 succeeded at 3145 (offset -5 lines). Hunk #12 succeeded at 4834 (offset 8 lines). Hunk #13 succeeded at 5301 (offset 8 lines). patching file src/backend/commands/Makefile patching file src/backend/commands/dropcmds.c patching file src/backend/commands/event_trigger.c patching file src/backend/commands/formatcastcmds.c patching file src/backend/commands/meson.build patching file src/backend/commands/seclabel.c patching file src/backend/parser/gram.y Hunk #2 succeeded at 1117 (offset 11 lines). Hunk #3 succeeded at 1138 (offset 11 lines). Hunk #4 succeeded at 5536 (offset 11 lines). Hunk #5 succeeded at 7536 (offset 11 lines). Hunk #6 succeeded at 9926 (offset 11 lines). patching file src/backend/tcop/utility.c patching file src/bin/pg_dump/common.c patching file src/bin/pg_dump/pg_dump.c Hunk #2 succeeded at 9175 (offset -146 lines). Hunk #3 succeeded at 11818 (offset -173 lines). Hunk #4 succeeded at 14155 (offset -181 lines). Hunk #5 succeeded at 20594 (offset -267 lines). patching file src/bin/pg_dump/pg_dump.h patching file src/bin/pg_dump/pg_dump_sort.c patching file src/include/catalog/Makefile 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/meson.build patching file src/include/catalog/pg_format_cast.h patching file src/include/commands/formatcast.h patching file src/include/nodes/parsenodes.h Hunk #1 succeeded at 2489 (offset 44 lines). Hunk #2 succeeded at 4401 (offset 44 lines). patching file src/include/tcop/cmdtaglist.h patching file src/test/regress/expected/format_casts.out patching file src/test/regress/expected/oidjoins.out patching file src/test/regress/parallel_schedule patching file src/test/regress/sql/format_casts.sql patching file src/tools/pgindent/typedefs.list Hunk #1 succeeded at 579 (offset 4 lines). Hunk #2 succeeded at 925 (offset 3 lines). Hunk #3 succeeded at 991 (offset 3 lines). Hunk #4 succeeded at 1033 (offset 3 lines). Unstaged changes after reset: M doc/src/sgml/catalogs.sgml M doc/src/sgml/ref/allfiles.sgml M doc/src/sgml/ref/alter_extension.sgml M doc/src/sgml/ref/comment.sgml M doc/src/sgml/reference.sgml M src/backend/catalog/aclchk.c M src/backend/catalog/dependency.c M src/backend/catalog/objectaddress.c M src/backend/commands/Makefile M src/backend/commands/dropcmds.c M src/backend/commands/event_trigger.c M src/backend/commands/meson.build M src/backend/commands/seclabel.c M src/backend/parser/gram.y M src/backend/tcop/utility.c M src/bin/pg_dump/common.c M src/bin/pg_dump/pg_dump.c M src/bin/pg_dump/pg_dump.h M src/bin/pg_dump/pg_dump_sort.c M src/include/catalog/Makefile M src/include/catalog/meson.build M src/include/nodes/parsenodes.h M src/include/tcop/cmdtaglist.h M src/test/regress/expected/oidjoins.out M src/test/regress/parallel_schedule M src/tools/pgindent/typedefs.list Removing doc/src/sgml/ref/create_format_cast.sgml Removing doc/src/sgml/ref/drop_format_cast.sgml Removing src/backend/commands/formatcastcmds.c Removing src/include/catalog/catversion.h.rej Removing src/include/catalog/pg_format_cast.h Removing src/include/commands/formatcast.h Removing src/test/regress/expected/format_casts.out Removing src/test/regress/sql/format_casts.sql === using 'git apply' to apply patch ./v2-0002-Add-pg_format_cast-and-CREATE-DROP-FORMAT-CAST.patch === Applied patch to 'doc/src/sgml/catalogs.sgml' cleanly. Applied patch to 'doc/src/sgml/ref/allfiles.sgml' cleanly. Applied patch to 'doc/src/sgml/ref/alter_extension.sgml' cleanly. Applied patch to 'doc/src/sgml/ref/comment.sgml' cleanly. Falling back to direct application... Falling back to direct application... Applied patch to 'doc/src/sgml/reference.sgml' cleanly. Applied patch to 'src/backend/catalog/aclchk.c' cleanly. Applied patch to 'src/backend/catalog/dependency.c' cleanly. Applied patch to 'src/backend/catalog/objectaddress.c' cleanly. Applied patch to 'src/backend/commands/Makefile' cleanly. Applied patch to 'src/backend/commands/dropcmds.c' cleanly. Applied patch to 'src/backend/commands/event_trigger.c' cleanly. Falling back to direct application... Applied patch to 'src/backend/commands/meson.build' cleanly. Applied patch to 'src/backend/commands/seclabel.c' cleanly. error: repository lacks the necessary blob to perform 3-way merge. Falling back to direct application... Applied patch to 'src/backend/tcop/utility.c' cleanly. Applied patch to 'src/bin/pg_dump/common.c' cleanly. Applied patch to 'src/bin/pg_dump/pg_dump.c' cleanly. Applied patch to 'src/bin/pg_dump/pg_dump.h' cleanly. Applied patch to 'src/bin/pg_dump/pg_dump_sort.c' cleanly. Applied patch to 'src/include/catalog/Makefile' cleanly. Applied patch to 'src/include/catalog/catversion.h' with conflicts. Applied patch to 'src/include/catalog/meson.build' cleanly. Falling back to direct application... Falling back to direct application... error: repository lacks the necessary blob to perform 3-way merge. Falling back to direct application... Applied patch to 'src/include/tcop/cmdtaglist.h' cleanly. Falling back to direct application... Applied patch to 'src/test/regress/expected/oidjoins.out' cleanly. Applied patch to 'src/test/regress/parallel_schedule' cleanly. Falling back to direct application... Applied patch to 'src/tools/pgindent/typedefs.list' cleanly. U src/include/catalog/catversion.h diff --cc src/include/catalog/catversion.h index ba4e2b4d908,6402cc76c87..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 202607091 ++======= + #define CATALOG_VERSION_NO 202606282 ++>>>>>>> theirs #endif