=== Applying patches on top of PostgreSQL commit ID 5b5bf51e435304b2043db46b65455747de2af1f5 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Fri Apr 10 03:18:32 UTC 2026 On branch cf/6267 nothing to commit, working tree clean === using 'git am' to apply patch ./v10-0001-Introduce-new-type-of-logical-replication-messag.patch === Applying: Introduce new type of logical replication messages to track dependencies === using 'git am' to apply patch ./v10-0002-Introduce-a-shared-hash-table-to-store-paralleli.patch === Applying: Introduce a shared hash table to store parallelized transactions === using 'git am' to apply patch ./v10-0003-Introduce-a-local-hash-table-to-store-replica-id.patch === Applying: Introduce a local hash table to store replica identities === using 'git am' to apply patch ./v10-0004-Parallel-apply-non-streaming-transactions.patch === Applying: Parallel apply non-streaming transactions error: sha1 information is lacking or useless (src/backend/replication/logical/applyparallelworker.c). error: could not build fake ancestor hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 Parallel apply non-streaming transactions 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 ./v10-0004-Parallel-apply-non-streaming-transactions.patch === patching file src/backend/replication/logical/applyparallelworker.c patching file src/backend/replication/logical/proto.c patching file src/backend/replication/logical/relation.c patching file src/backend/replication/logical/worker.c Hunk #1 succeeded at 290 (offset 1 line). Hunk #2 succeeded at 490 (offset 1 line). Hunk #3 succeeded at 610 (offset 1 line). Hunk #4 succeeded at 682 (offset 1 line). Hunk #5 succeeded at 1414 (offset 1 line). Hunk #6 succeeded at 1427 (offset 1 line). Hunk #7 succeeded at 1437 (offset 1 line). Hunk #8 succeeded at 1862 (offset 1 line). Hunk #9 succeeded at 1959 (offset 1 line). Hunk #10 succeeded at 1999 (offset 1 line). Hunk #11 succeeded at 2014 (offset 1 line). Hunk #12 succeeded at 2229 (offset 1 line). Hunk #13 succeeded at 2290 (offset 1 line). Hunk #14 succeeded at 2360 (offset 1 line). Hunk #15 succeeded at 2423 (offset 1 line). Hunk #16 succeeded at 2676 (offset 1 line). Hunk #17 succeeded at 3408 (offset 1 line). Hunk #18 succeeded at 3442 (offset 1 line). Hunk #19 succeeded at 4219 (offset 1 line). Hunk #20 succeeded at 4771 (offset 1 line). Hunk #21 succeeded at 4784 (offset 1 line). Hunk #22 succeeded at 4794 (offset 1 line). Hunk #23 succeeded at 4832 (offset 1 line). Hunk #24 succeeded at 4862 (offset 1 line). Hunk #25 succeeded at 6346 (offset 1 line). Hunk #26 succeeded at 6391 (offset 1 line). Hunk #27 succeeded at 6439 (offset 1 line). patching file src/include/replication/logicalproto.h patching file src/include/replication/logicalrelation.h patching file src/include/replication/worker_internal.h patching file src/test/subscription/meson.build Hunk #1 FAILED at 47. 1 out of 1 hunk FAILED -- saving rejects to file src/test/subscription/meson.build.rej patching file src/test/subscription/t/001_rep_changes.pl patching file src/test/subscription/t/010_truncate.pl patching file src/test/subscription/t/015_stream.pl patching file src/test/subscription/t/026_stats.pl patching file src/test/subscription/t/027_nosuperuser.pl patching file src/test/subscription/t/050_parallel_apply.pl patching file src/tools/pgindent/typedefs.list Hunk #1 succeeded at 2149 (offset 22 lines). Hunk #2 succeeded at 4232 (offset 49 lines). Unstaged changes after reset: M src/backend/replication/logical/applyparallelworker.c M src/backend/replication/logical/proto.c M src/backend/replication/logical/relation.c M src/backend/replication/logical/worker.c M src/include/replication/logicalproto.h M src/include/replication/logicalrelation.h M src/include/replication/worker_internal.h M src/test/subscription/t/001_rep_changes.pl M src/test/subscription/t/010_truncate.pl M src/test/subscription/t/015_stream.pl M src/test/subscription/t/026_stats.pl M src/test/subscription/t/027_nosuperuser.pl M src/tools/pgindent/typedefs.list Removing src/test/subscription/meson.build.rej Removing src/test/subscription/t/050_parallel_apply.pl === using 'git apply' to apply patch ./v10-0004-Parallel-apply-non-streaming-transactions.patch === error: repository lacks the necessary blob to perform 3-way merge. Falling back to direct application... Applied patch to 'src/backend/replication/logical/proto.c' cleanly. Applied patch to 'src/backend/replication/logical/relation.c' cleanly. error: repository lacks the necessary blob to perform 3-way merge. Falling back to direct application... Applied patch to 'src/include/replication/logicalproto.h' cleanly. Applied patch to 'src/include/replication/logicalrelation.h' cleanly. Applied patch to 'src/include/replication/worker_internal.h' cleanly. Applied patch to 'src/test/subscription/meson.build' with conflicts. Applied patch to 'src/test/subscription/t/001_rep_changes.pl' cleanly. Applied patch to 'src/test/subscription/t/010_truncate.pl' cleanly. Applied patch to 'src/test/subscription/t/015_stream.pl' cleanly. Applied patch to 'src/test/subscription/t/026_stats.pl' cleanly. Applied patch to 'src/test/subscription/t/027_nosuperuser.pl' cleanly. Falling back to direct application... error: repository lacks the necessary blob to perform 3-way merge. Falling back to direct application... U src/test/subscription/meson.build diff --cc src/test/subscription/meson.build index e71e95c6297,f22eb38068b..00000000000 --- a/src/test/subscription/meson.build +++ b/src/test/subscription/meson.build @@@ -47,7 -47,7 +47,11 @@@ tests += 't/035_conflicts.pl', 't/036_sequences.pl', 't/037_except.pl', ++<<<<<<< ours + 't/038_walsnd_shutdown_timeout.pl', ++======= + 't/050_parallel_apply.pl', ++>>>>>>> theirs 't/100_bugs.pl', ], },