=== Applying patches on top of PostgreSQL commit ID 325fc0ab14d11fc87da594857ffbb6636affe7c0 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Thu Aug 28 15:16:19 UTC 2025
On branch cf/5086
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v8-0001-doc-Add-an-overview-of-NULL-treatment-in-PostgreSQL.patch ===
Applying: doc: Add an overview of NULL treatment in PostgreSQL
Using index info to reconstruct a base tree...
M	doc/src/sgml/datatype.sgml
M	doc/src/sgml/ddl.sgml
M	doc/src/sgml/filelist.sgml
A	doc/src/sgml/func.sgml
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): doc/src/sgml/func.sgml deleted in HEAD and modified in doc: Add an overview of NULL treatment in PostgreSQL. Version doc: Add an overview of NULL treatment in PostgreSQL of doc/src/sgml/func.sgml left in tree.
Auto-merging doc/src/sgml/filelist.sgml
Auto-merging doc/src/sgml/ddl.sgml
Auto-merging doc/src/sgml/datatype.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 doc: Add an overview of NULL treatment in PostgreSQL
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/datatype.sgml
M	doc/src/sgml/ddl.sgml
M	doc/src/sgml/filelist.sgml
M	doc/src/sgml/json.sgml
M	doc/src/sgml/ref/create_domain.sgml
M	doc/src/sgml/syntax.sgml
Removing doc/src/sgml/func.sgml
Removing doc/src/sgml/nullvalues.sgml
=== using patch(1) to apply patch ./v8-0001-doc-Add-an-overview-of-NULL-treatment-in-PostgreSQL.patch ===
patching file doc/src/sgml/datatype.sgml
Hunk #1 succeeded at 5398 (offset 9 lines).
patching file doc/src/sgml/ddl.sgml
patching file doc/src/sgml/filelist.sgml
Hunk #1 succeeded at 24 (offset 3 lines).
can't find file to patch at input line 70
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml
|index c67688cbf5f..324d6ca9fff 100644
|--- a/doc/src/sgml/func.sgml
|+++ b/doc/src/sgml/func.sgml
--------------------------
No file to patch.  Skipping patch.
18 out of 18 hunks ignored
patching file doc/src/sgml/json.sgml
patching file doc/src/sgml/nullvalues.sgml
patching file doc/src/sgml/ref/create_domain.sgml
patching file doc/src/sgml/syntax.sgml
Unstaged changes after reset:
M	doc/src/sgml/datatype.sgml
M	doc/src/sgml/ddl.sgml
M	doc/src/sgml/filelist.sgml
M	doc/src/sgml/json.sgml
M	doc/src/sgml/ref/create_domain.sgml
M	doc/src/sgml/syntax.sgml
Removing doc/src/sgml/nullvalues.sgml
=== using 'git apply' to apply patch ./v8-0001-doc-Add-an-overview-of-NULL-treatment-in-PostgreSQL.patch ===
Applied patch to 'doc/src/sgml/datatype.sgml' cleanly.
Applied patch to 'doc/src/sgml/ddl.sgml' cleanly.
Applied patch to 'doc/src/sgml/filelist.sgml' cleanly.
error: doc/src/sgml/func.sgml: does not exist in index
Applied patch to 'doc/src/sgml/json.sgml' cleanly.
Falling back to direct application...
Applied patch to 'doc/src/sgml/ref/create_domain.sgml' cleanly.
Applied patch to 'doc/src/sgml/syntax.sgml' cleanly.