=== Applying patches on top of PostgreSQL commit ID db26517e79c182b14075e948acf4b23e30f074fd === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Thu Nov 19 22:18:35 UTC 2026 On branch cf/7572 nothing to commit, working tree clean === using 'git am' to apply patch ./v1-0001-Fix-walreceiver-restart-skipping-the-end-of-a-WAL.patch === Applying: Fix walreceiver restart skipping the end of a WAL segment Using index info to reconstruct a base tree... M src/backend/access/transam/xlogrecovery.c M src/test/recovery/meson.build Falling back to patching base and 3-way merge... Auto-merging src/test/recovery/meson.build CONFLICT (content): Merge conflict in src/test/recovery/meson.build Auto-merging src/backend/access/transam/xlogrecovery.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 walreceiver restart skipping the end of a WAL segment 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-0001-Fix-walreceiver-restart-skipping-the-end-of-a-WAL.patch === patching file src/backend/access/transam/xlogrecovery.c Hunk #1 succeeded at 3866 (offset 13 lines). Hunk #2 succeeded at 3875 (offset 13 lines). patching file src/test/recovery/meson.build Hunk #1 FAILED at 69. 1 out of 1 hunk FAILED -- saving rejects to file src/test/recovery/meson.build.rej patching file src/test/recovery/t/061_walrcv_restart_segment_boundary.pl Unstaged changes after reset: M src/backend/access/transam/xlogrecovery.c Removing src/test/recovery/meson.build.rej Removing src/test/recovery/t/061_walrcv_restart_segment_boundary.pl === using 'git apply' to apply patch ./v1-0001-Fix-walreceiver-restart-skipping-the-end-of-a-WAL.patch === Applied patch to 'src/backend/access/transam/xlogrecovery.c' cleanly. Applied patch to 'src/test/recovery/meson.build' with conflicts. Falling back to direct application... U src/test/recovery/meson.build diff --cc src/test/recovery/meson.build index cb3df6ed895,f76c4893628..00000000000 --- a/src/test/recovery/meson.build +++ b/src/test/recovery/meson.build @@@ -69,7 -69,7 +69,11 @@@ tests += 't/058_shutdown_crash_restart.pl', 't/059_remote_apply_status_interval.pl', 't/060_multixact_crashed_updater.pl', ++<<<<<<< ours + 't/061_recovery_target_prefetch.pl', ++======= + 't/061_walrcv_restart_segment_boundary.pl', ++>>>>>>> theirs ], }, }