=== Applying patches on top of PostgreSQL commit ID 77705d1e5a616339c3e92f586bbfa7b6bb562beb === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Sat Oct 31 16:54:27 UTC 2026 On branch cf/7470 nothing to commit, working tree clean === using 'git am' to apply patch ./v1-0001-Move-buffer-strategy-ownership-out-of-BulkInsertS.patch === Applying: Move buffer strategy ownership out of BulkInsertState === using 'git am' to apply patch ./v1-0002-Bind-BulkInsertState-to-one-relation.patch === Applying: Bind BulkInsertState to one relation === using 'git am' to apply patch ./v1-0003-Use-bulk-write-strategy-for-TOAST-inserts.patch === Applying: Use bulk-write strategy for TOAST inserts Using index info to reconstruct a base tree... M src/backend/access/common/toast_internals.c Falling back to patching base and 3-way merge... Auto-merging src/backend/access/common/toast_internals.c CONFLICT (content): Merge conflict in src/backend/access/common/toast_internals.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 Use bulk-write strategy for TOAST inserts 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-0003-Use-bulk-write-strategy-for-TOAST-inserts.patch === patching file src/backend/access/common/toast_internals.c Hunk #2 FAILED at 25. Hunk #3 succeeded at 186 (offset 1 line). Hunk #4 succeeded at 224 (offset 1 line). Hunk #5 succeeded at 378 (offset 3 lines). 1 out of 5 hunks FAILED -- saving rejects to file src/backend/access/common/toast_internals.c.rej patching file src/backend/access/heap/heapam.c patching file src/backend/access/heap/heaptoast.c patching file src/backend/access/heap/hio.c patching file src/backend/access/heap/rewriteheap.c patching file src/backend/access/table/toast_helper.c patching file src/include/access/heaptoast.h patching file src/include/access/hio.h patching file src/include/access/tableam.h patching file src/include/access/toast_helper.h patching file src/include/access/toast_internals.h patching file src/test/regress/expected/copy.out patching file src/test/regress/expected/stats.out patching file src/test/regress/sql/copy.sql patching file src/test/regress/sql/stats.sql Unstaged changes after reset: M src/backend/access/common/toast_internals.c M src/backend/access/heap/heapam.c M src/backend/access/heap/heaptoast.c M src/backend/access/heap/hio.c M src/backend/access/heap/rewriteheap.c M src/backend/access/table/toast_helper.c M src/include/access/heaptoast.h M src/include/access/hio.h M src/include/access/tableam.h M src/include/access/toast_helper.h M src/include/access/toast_internals.h M src/test/regress/expected/copy.out M src/test/regress/expected/stats.out M src/test/regress/sql/copy.sql M src/test/regress/sql/stats.sql Removing src/backend/access/common/toast_internals.c.rej === using 'git apply' to apply patch ./v1-0003-Use-bulk-write-strategy-for-TOAST-inserts.patch === Applied patch to 'src/backend/access/common/toast_internals.c' with conflicts. Applied patch to 'src/backend/access/heap/heapam.c' cleanly. Applied patch to 'src/backend/access/heap/heaptoast.c' cleanly. Applied patch to 'src/backend/access/heap/hio.c' cleanly. Applied patch to 'src/backend/access/heap/rewriteheap.c' cleanly. Applied patch to 'src/backend/access/table/toast_helper.c' cleanly. Applied patch to 'src/include/access/heaptoast.h' cleanly. Applied patch to 'src/include/access/hio.h' cleanly. Applied patch to 'src/include/access/tableam.h' cleanly. Applied patch to 'src/include/access/toast_helper.h' cleanly. Applied patch to 'src/include/access/toast_internals.h' cleanly. Applied patch to 'src/test/regress/expected/copy.out' cleanly. Applied patch to 'src/test/regress/expected/stats.out' cleanly. Applied patch to 'src/test/regress/sql/copy.sql' cleanly. Applied patch to 'src/test/regress/sql/stats.sql' cleanly. U src/backend/access/common/toast_internals.c diff --cc src/backend/access/common/toast_internals.c index a42ca7ed76c,68508c03715..00000000000 --- a/src/backend/access/common/toast_internals.c +++ b/src/backend/access/common/toast_internals.c @@@ -24,7 -25,7 +25,11 @@@ #include "catalog/catalog.h" #include "miscadmin.h" #include "utils/fmgroids.h" ++<<<<<<< ours +#include "utils/injection_point.h" ++======= + #include "utils/memutils.h" ++>>>>>>> theirs #include "utils/rel.h" #include "utils/snapmgr.h"