=== Applying patches on top of PostgreSQL commit ID 03985e1e52672c70297b38a3c658fefb6faa57cf ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Mon Oct  5 02:25:33 UTC 2026
On branch cf/6212
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v11-0001-Add-pg_get_domain_ddl-function-to-reconstruct-CR.patch ===
Applying: Add pg_get_domain_ddl() function to reconstruct CREATE DOMAIN statements
Using index info to reconstruct a base tree...
M	doc/src/sgml/func/func-info.sgml
M	src/backend/utils/adt/ruleutils.c
M	src/include/catalog/pg_proc.dat
A	src/test/regress/expected/create_property_graph.out
M	src/test/regress/expected/create_schema.out
M	src/test/regress/expected/event_trigger.out
Falling back to patching base and 3-way merge...
Auto-merging src/test/regress/expected/event_trigger.out
Auto-merging src/test/regress/expected/create_schema.out
CONFLICT (content): Merge conflict in src/test/regress/expected/create_schema.out
CONFLICT (modify/delete): src/test/regress/expected/create_property_graph.out deleted in HEAD and modified in Add pg_get_domain_ddl() function to reconstruct CREATE DOMAIN statements. Version Add pg_get_domain_ddl() function to reconstruct CREATE DOMAIN statements of src/test/regress/expected/create_property_graph.out left in tree.
Auto-merging src/include/catalog/pg_proc.dat
Auto-merging src/backend/utils/adt/ruleutils.c
Auto-merging doc/src/sgml/func/func-info.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 Add pg_get_domain_ddl() function to reconstruct CREATE DOMAIN statements
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 ./v11-0001-Add-pg_get_domain_ddl-function-to-reconstruct-CR.patch ===
patching file doc/src/sgml/func/func-info.sgml
Hunk #1 succeeded at 3848 (offset -5 lines).
Hunk #2 succeeded at 3955 (offset -5 lines).
patching file src/backend/utils/adt/ddlutils.c
patching file src/backend/utils/adt/ruleutils.c
Hunk #1 succeeded at 94 (offset -5 lines).
Hunk #2 succeeded at 541 (offset -8 lines).
Hunk #3 succeeded at 553 (offset -8 lines).
Hunk #4 succeeded at 13698 (offset -467 lines).
Hunk #5 succeeded at 13900 (offset -467 lines).
patching file src/include/catalog/pg_proc.dat
Hunk #1 succeeded at 8689 (offset 55 lines).
patching file src/include/utils/ruleutils.h
can't find file to patch at input line 466
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/src/test/regress/expected/create_property_graph.out b/src/test/regress/expected/create_property_graph.out
|index 2f06c7ce5a8..77599f00331 100644
|--- a/src/test/regress/expected/create_property_graph.out
|+++ b/src/test/regress/expected/create_property_graph.out
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
patching file src/test/regress/expected/create_schema.out
Hunk #1 FAILED at 307.
Hunk #2 FAILED at 322.
2 out of 2 hunks FAILED -- saving rejects to file src/test/regress/expected/create_schema.out.rej
patching file src/test/regress/expected/domain.out
patching file src/test/regress/expected/event_trigger.out
Hunk #1 succeeded at 793 (offset -22 lines).
patching file src/test/regress/expected/test_setup.out
patching file src/test/regress/sql/domain.sql
patching file src/test/regress/sql/test_setup.sql
Unstaged changes after reset:
M	doc/src/sgml/func/func-info.sgml
M	src/backend/utils/adt/ddlutils.c
M	src/backend/utils/adt/ruleutils.c
M	src/include/catalog/pg_proc.dat
M	src/include/utils/ruleutils.h
M	src/test/regress/expected/domain.out
M	src/test/regress/expected/event_trigger.out
M	src/test/regress/expected/test_setup.out
M	src/test/regress/sql/domain.sql
M	src/test/regress/sql/test_setup.sql
Removing src/test/regress/expected/create_schema.out.rej
=== using 'git apply' to apply patch ./v11-0001-Add-pg_get_domain_ddl-function-to-reconstruct-CR.patch ===
Applied patch to 'doc/src/sgml/func/func-info.sgml' cleanly.
Applied patch to 'src/backend/utils/adt/ddlutils.c' cleanly.
Applied patch to 'src/backend/utils/adt/ruleutils.c' cleanly.
Applied patch to 'src/include/catalog/pg_proc.dat' cleanly.
Applied patch to 'src/include/utils/ruleutils.h' cleanly.
error: src/test/regress/expected/create_property_graph.out: does not exist in index
Applied patch to 'src/test/regress/expected/create_schema.out' with conflicts.
Applied patch to 'src/test/regress/expected/domain.out' cleanly.
Applied patch to 'src/test/regress/expected/event_trigger.out' cleanly.
Applied patch to 'src/test/regress/expected/test_setup.out' cleanly.
Applied patch to 'src/test/regress/sql/domain.sql' cleanly.
Applied patch to 'src/test/regress/sql/test_setup.sql' cleanly.