=== Applying patches on top of PostgreSQL commit ID 2106fe25a1c025a75effb7fefcbd47c68d4b9914 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sat Aug  2 11:41:19 UTC 2025
On branch cf/5821
nothing to commit, working tree clean
warning: quoted CRLF detected
=== using 'git am' to apply patch ./v3-0001-pg_restore-clean-data-only.patch ===
Applying: pg_restore --clean --data-only
Using index info to reconstruct a base tree...
M	doc/src/sgml/ref/pg_restore.sgml
M	src/bin/pg_dump/pg_backup.h
M	src/bin/pg_dump/pg_backup_archiver.c
M	src/bin/pg_dump/pg_restore.c
M	src/bin/pg_dump/t/001_basic.pl
Falling back to patching base and 3-way merge...
Auto-merging src/bin/pg_dump/t/001_basic.pl
Auto-merging src/bin/pg_dump/pg_restore.c
CONFLICT (content): Merge conflict in src/bin/pg_dump/pg_restore.c
Auto-merging src/bin/pg_dump/pg_backup_archiver.c
Auto-merging src/bin/pg_dump/pg_backup.h
Auto-merging doc/src/sgml/ref/pg_restore.sgml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 pg_restore --clean --data-only
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	doc/src/sgml/ref/pg_restore.sgml
M	src/bin/pg_dump/pg_backup.h
M	src/bin/pg_dump/pg_backup_archiver.c
M	src/bin/pg_dump/pg_restore.c
M	src/bin/pg_dump/t/001_basic.pl
=== using patch(1) to apply patch ./v3-0001-pg_restore-clean-data-only.patch ===
(Stripping trailing CRs from patch; use --binary to disable.)
patching file doc/src/sgml/ref/pg_restore.sgml
Hunk #1 succeeded at 112 (offset -9 lines).
(Stripping trailing CRs from patch; use --binary to disable.)
patching file src/bin/pg_dump/pg_backup.h
(Stripping trailing CRs from patch; use --binary to disable.)
patching file src/bin/pg_dump/pg_backup_archiver.c
Hunk #1 succeeded at 975 (offset -3 lines).
(Stripping trailing CRs from patch; use --binary to disable.)
patching file src/bin/pg_dump/pg_restore.c
Hunk #1 succeeded at 175 with fuzz 1 (offset -31 lines).
Hunk #2 FAILED at 419.
Hunk #3 succeeded at 415 with fuzz 1 (offset -35 lines).
1 out of 3 hunks FAILED -- saving rejects to file src/bin/pg_dump/pg_restore.c.rej
(Stripping trailing CRs from patch; use --binary to disable.)
patching file src/bin/pg_dump/t/001_basic.pl
Unstaged changes after reset:
M	doc/src/sgml/ref/pg_restore.sgml
M	src/bin/pg_dump/pg_backup.h
M	src/bin/pg_dump/pg_backup_archiver.c
M	src/bin/pg_dump/pg_restore.c
M	src/bin/pg_dump/t/001_basic.pl
Removing src/bin/pg_dump/pg_restore.c.rej
=== using 'git apply' to apply patch ./v3-0001-pg_restore-clean-data-only.patch ===
error: patch failed: doc/src/sgml/ref/pg_restore.sgml:121
Falling back to direct application...
error: patch failed: doc/src/sgml/ref/pg_restore.sgml:121
error: doc/src/sgml/ref/pg_restore.sgml: patch does not apply
error: patch failed: src/bin/pg_dump/pg_backup.h:99
Falling back to direct application...
error: patch failed: src/bin/pg_dump/pg_backup.h:99
error: src/bin/pg_dump/pg_backup.h: patch does not apply
error: patch failed: src/bin/pg_dump/pg_backup_archiver.c:978
Falling back to direct application...
error: patch failed: src/bin/pg_dump/pg_backup_archiver.c:978
error: src/bin/pg_dump/pg_backup_archiver.c: patch does not apply
error: patch failed: src/bin/pg_dump/pg_restore.c:206
Falling back to direct application...
error: patch failed: src/bin/pg_dump/pg_restore.c:206
error: src/bin/pg_dump/pg_restore.c: patch does not apply
error: patch failed: src/bin/pg_dump/t/001_basic.pl:95
Falling back to direct application...
error: patch failed: src/bin/pg_dump/t/001_basic.pl:95
error: src/bin/pg_dump/t/001_basic.pl: patch does not apply