=== Applying patches on top of PostgreSQL commit ID 2214a207ee8170afce79478df3b37114a94d976e === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Wed Dec 24 03:27:21 UTC 2025 On branch cf/6336 nothing to commit, working tree clean === using 'git am' to apply patch ./v2_HEAD-0001-Fix-unexpected-origin-advancement-during-par.patch === Applying: Fix unexpected origin advancement during parallel apply failure === using 'git am' to apply patch ./v2_PG16-0001-Fix-unexpected-origin-advancement-during-par.patch === Applying: Fix unexpected origin advancement during parallel apply failure Using index info to reconstruct a base tree... M src/backend/replication/logical/worker.c M src/test/subscription/t/023_twophase_stream.pl Falling back to patching base and 3-way merge... Auto-merging src/test/subscription/t/023_twophase_stream.pl Auto-merging src/backend/replication/logical/worker.c CONFLICT (content): Merge conflict in src/backend/replication/logical/worker.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 Fix unexpected origin advancement during parallel apply failure 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". Unstaged changes after reset: M src/backend/replication/logical/worker.c === using patch(1) to apply patch ./v2_PG16-0001-Fix-unexpected-origin-advancement-during-par.patch === patching file src/backend/replication/logical/worker.c Hunk #1 FAILED at 4544. Hunk #2 FAILED at 4581. 2 out of 2 hunks FAILED -- saving rejects to file src/backend/replication/logical/worker.c.rej patching file src/test/subscription/t/023_twophase_stream.pl Hunk #1 succeeded at 474 with fuzz 2 (offset 45 lines). Unstaged changes after reset: M src/test/subscription/t/023_twophase_stream.pl Removing src/backend/replication/logical/worker.c.rej === using 'git apply' to apply patch ./v2_PG16-0001-Fix-unexpected-origin-advancement-during-par.patch === Applied patch to 'src/backend/replication/logical/worker.c' with conflicts. Applied patch to 'src/test/subscription/t/023_twophase_stream.pl' cleanly. U src/backend/replication/logical/worker.c diff --cc src/backend/replication/logical/worker.c index 718408bb599,d6bbffd7c8d..00000000000 --- a/src/backend/replication/logical/worker.c +++ b/src/backend/replication/logical/worker.c @@@ -5907,7 -4596,9 +5907,13 @@@ SetupApplyOrSyncWorker(int worker_slot /* Load the libpq-specific functions */ load_file("libpqwalreceiver", false); ++<<<<<<< ours + InitializeLogRepWorker(); ++======= + InitializeApplyWorker(); + + InitializingApplyWorker = false; ++>>>>>>> theirs /* Connect to the origin and start the replication. */ elog(DEBUG1, "connecting to publisher using connection string \"%s\"",