=== Applying patches on top of PostgreSQL commit ID 1c77203c15e43d4ae9a8fed67ce89eeeca54af8f === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Mon Jun 8 22:14:24 UTC 2026 On branch cf/6672 nothing to commit, working tree clean === using 'git am' to apply patch ./v2-0001-Report-set-parameters-on-recovery_target-conflict.patch === Applying: Report set parameters on recovery_target conflict; expand tests error: sha1 information is lacking or useless (src/backend/access/transam/xlogrecovery.c). error: could not build fake ancestor hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 Report set parameters on recovery_target conflict; expand tests 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 ./v2-0001-Report-set-parameters-on-recovery_target-conflict.patch === patching file src/backend/access/transam/xlogrecovery.c Hunk #1 FAILED at 1167. Hunk #2 FAILED at 1201. 2 out of 2 hunks FAILED -- saving rejects to file src/backend/access/transam/xlogrecovery.c.rej patching file src/test/recovery/t/003_recovery_targets.pl Hunk #1 FAILED at 282. Hunk #2 succeeded at 190 with fuzz 2 (offset -168 lines). 1 out of 2 hunks FAILED -- saving rejects to file src/test/recovery/t/003_recovery_targets.pl.rej Unstaged changes after reset: M src/test/recovery/t/003_recovery_targets.pl Removing src/backend/access/transam/xlogrecovery.c.rej Removing src/test/recovery/t/003_recovery_targets.pl.rej === using 'git apply' to apply patch ./v2-0001-Report-set-parameters-on-recovery_target-conflict.patch === error: repository lacks the necessary blob to perform 3-way merge. Falling back to direct application... error: patch failed: src/backend/access/transam/xlogrecovery.c:1167 error: src/backend/access/transam/xlogrecovery.c: patch does not apply error: repository lacks the necessary blob to perform 3-way merge. Falling back to direct application... error: patch failed: src/test/recovery/t/003_recovery_targets.pl:282 error: src/test/recovery/t/003_recovery_targets.pl: patch does not apply