=== Applying patches on top of PostgreSQL commit ID d3b2e5e1ab5ca3e9738d20409debfdd299e65a2e ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Thu Mar 13 07:35:23 UTC 2025
On branch cf/5129
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v2-0001-mark_async_capable-subpath-should-match-subplan.patch ===
Applying: mark_async_capable(): subpath should match subplan
=== using 'git am' to apply patch ./v2-0002-MergeAppend-should-support-Async-Foreign-Scan-subpla.patch ===
Applying: MergeAppend should support Async Foreign Scan subplans
error: sha1 information is lacking or useless (src/backend/optimizer/plan/createplan.c).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 MergeAppend should support Async Foreign Scan subplans
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-0002-MergeAppend-should-support-Async-Foreign-Scan-subpla.patch ===
patch: unrecognized option `--no-backup-if-mismatch'
usage: patch [-bCcEeflNnRstuv] [-B backup-prefix] [-D symbol] [-d directory]
             [-F max-fuzz] [-i patchfile] [-o out-file] [-p strip-count]
             [-r rej-name] [-V t | nil | never | none] [-x number]
             [-z backup-ext] [--posix] [origfile [patchfile]]
       patch <patchfile
=== using 'git apply' to apply patch ./v2-0002-MergeAppend-should-support-Async-Foreign-Scan-subpla.patch ===
Applied patch to 'contrib/postgres_fdw/expected/postgres_fdw.out' cleanly.
Applied patch to 'contrib/postgres_fdw/postgres_fdw.c' cleanly.
Applied patch to 'contrib/postgres_fdw/sql/postgres_fdw.sql' cleanly.
Applied patch to 'doc/src/sgml/config.sgml' cleanly.
Applied patch to 'src/backend/executor/execAsync.c' cleanly.
Applied patch to 'src/backend/executor/nodeMergeAppend.c' with conflicts.
Applied patch to 'src/backend/optimizer/path/costsize.c' cleanly.
error: repository lacks the necessary blob to perform 3-way merge.
Falling back to direct application...
error: patch failed: src/backend/optimizer/plan/createplan.c:1448
error: src/backend/optimizer/plan/createplan.c: patch does not apply
Applied patch to 'src/backend/utils/misc/guc_tables.c' with conflicts.
Applied patch to 'src/backend/utils/misc/postgresql.conf.sample' cleanly.
Applied patch to 'src/include/executor/nodeMergeAppend.h' cleanly.
Applied patch to 'src/include/nodes/execnodes.h' cleanly.
Applied patch to 'src/include/optimizer/cost.h' cleanly.
Applied patch to 'src/test/regress/expected/sysviews.out' with conflicts.