=== Applying patches on top of PostgreSQL commit ID 9e7d152488f197e96f171f0714459c227c3f7693 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Sun Oct 11 07:36:28 UTC 2026 On branch cf/7423 nothing to commit, working tree clean === using 'git am' to apply patch ./v1-0001-Executor-support-for-detoasting-a-column-once-per.patch === Applying: Executor support for detoasting a column once per row. === using 'git am' to apply patch ./v1-0002-Decide-at-plan-time-which-columns-to-detoast-once.patch === Applying: Decide at plan time which columns to detoast once per row. === using 'git am' to apply patch ./v1-0003-Share-detoasted-values-with-subplan-and-nestloop-.patch === Applying: Share detoasted values with subplan and nestloop parameters. === using 'git am' to apply patch ./v1-0004-Test-once-per-row-detoasting.patch === Applying: Test once-per-row detoasting. Using index info to reconstruct a base tree... M src/test/modules/Makefile M src/test/modules/meson.build Falling back to patching base and 3-way merge... Auto-merging src/test/modules/meson.build Auto-merging src/test/modules/Makefile CONFLICT (content): Merge conflict in src/test/modules/Makefile error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 Test once-per-row detoasting. 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-0004-Test-once-per-row-detoasting.patch === patching file src/backend/access/common/detoast.c patching file src/test/modules/Makefile Hunk #1 FAILED at 61. 1 out of 1 hunk FAILED -- saving rejects to file src/test/modules/Makefile.rej patching file src/test/modules/detoast_reuse/.gitignore patching file src/test/modules/detoast_reuse/Makefile patching file src/test/modules/detoast_reuse/expected/detoast_reuse.out patching file src/test/modules/detoast_reuse/meson.build patching file src/test/modules/detoast_reuse/sql/detoast_reuse.sql patching file src/test/modules/meson.build Unstaged changes after reset: M src/backend/access/common/detoast.c M src/test/modules/meson.build Removing src/test/modules/Makefile.rej Removing src/test/modules/detoast_reuse/ === using 'git apply' to apply patch ./v1-0004-Test-once-per-row-detoasting.patch === Applied patch to 'src/backend/access/common/detoast.c' cleanly. Applied patch to 'src/test/modules/Makefile' with conflicts. 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/test/modules/meson.build' cleanly. U src/test/modules/Makefile diff --cc src/test/modules/Makefile index 6c1504ac932,cca1ab1f345..00000000000 --- a/src/test/modules/Makefile +++ b/src/test/modules/Makefile @@@ -61,9 -61,9 +61,15 @@@ SUBDIRS = ifeq ($(enable_injection_points),yes) ++<<<<<<< ours +SUBDIRS += injection_points gin hash nbtree typcache +else +ALWAYS_SUBDIRS += injection_points gin hash nbtree typcache ++======= + SUBDIRS += injection_points detoast_reuse gin nbtree typcache + else + ALWAYS_SUBDIRS += injection_points detoast_reuse gin nbtree typcache ++>>>>>>> theirs endif ifeq ($(with_ssl),openssl)