=== Applying patches on top of PostgreSQL commit ID dc5116780846951a409d788479a9e9fa6edd9f07 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Fri Jun 19 16:32:24 UTC 2026
On branch cf/6899
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v1-0001-Fix-pg_restore-no-globals-SQL-output-for-pg_dumpa.patch ===
Applying: Fix pg_restore --no-globals SQL output for pg_dumpall archives
Using index info to reconstruct a base tree...
M	src/bin/pg_dump/pg_restore.c
A	src/bin/pg_dump/t/007_pg_dumpall.pl
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): src/bin/pg_dump/t/007_pg_dumpall.pl deleted in HEAD and modified in Fix pg_restore --no-globals SQL output for pg_dumpall archives. Version Fix pg_restore --no-globals SQL output for pg_dumpall archives of src/bin/pg_dump/t/007_pg_dumpall.pl left in tree.
Auto-merging src/bin/pg_dump/pg_restore.c
CONFLICT (content): Merge conflict in src/bin/pg_dump/pg_restore.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 pg_restore --no-globals SQL output for pg_dumpall archives
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-pg_restore-no-globals-SQL-output-for-pg_dumpa.patch ===
patching file src/bin/pg_dump/pg_restore.c
Hunk #1 FAILED at 575.
1 out of 1 hunk FAILED -- saving rejects to file src/bin/pg_dump/pg_restore.c.rej
can't find file to patch at input line 53
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/src/bin/pg_dump/t/007_pg_dumpall.pl b/src/bin/pg_dump/t/007_pg_dumpall.pl
|index 22f11a13a9a..93355f4c5b0 100644
|--- a/src/bin/pg_dump/t/007_pg_dumpall.pl
|+++ b/src/bin/pg_dump/t/007_pg_dumpall.pl
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
Removing src/bin/pg_dump/pg_restore.c.rej
=== using 'git apply' to apply patch ./v1-0001-Fix-pg_restore-no-globals-SQL-output-for-pg_dumpa.patch ===
Applied patch to 'src/bin/pg_dump/pg_restore.c' with conflicts.
error: src/bin/pg_dump/t/007_pg_dumpall.pl: does not exist in index