=== Applying patches on top of PostgreSQL commit ID 972c14fb9134fdfd76ea6ebcf98a55a945bbc988 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Wed Apr 15 06:30:30 UTC 2026
On branch cf/6031
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v1-0001-UPDATE-with-invalid-domain-constraint.patch ===
Applying: UPDATE with invalid domain constraint
Using index info to reconstruct a base tree...
M	src/backend/rewrite/rewriteHandler.c
M	src/backend/utils/cache/typcache.c
M	src/include/utils/typcache.h
M	src/test/regress/expected/domain.out
Falling back to patching base and 3-way merge...
Auto-merging src/test/regress/expected/domain.out
Auto-merging src/include/utils/typcache.h
CONFLICT (content): Merge conflict in src/include/utils/typcache.h
Auto-merging src/backend/utils/cache/typcache.c
Auto-merging src/backend/rewrite/rewriteHandler.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 UPDATE with invalid domain constraint
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-UPDATE-with-invalid-domain-constraint.patch ===
patching file src/backend/rewrite/rewriteHandler.c
Hunk #1 succeeded at 748 (offset 18 lines).
Hunk #2 succeeded at 850 (offset 18 lines).
Hunk #3 succeeded at 861 (offset 18 lines).
Hunk #4 succeeded at 1036 (offset 18 lines).
patching file src/backend/utils/cache/typcache.c
Hunk #1 succeeded at 513 (offset 3 lines).
Hunk #2 succeeded at 1168 (offset 3 lines).
Hunk #3 succeeded at 1529 (offset 26 lines).
patching file src/include/utils/typcache.h
Hunk #2 FAILED at 186.
1 out of 2 hunks FAILED -- saving rejects to file src/include/utils/typcache.h.rej
patching file src/test/regress/expected/domain.out
Hunk #1 succeeded at 927 (offset 1 line).
patching file src/test/regress/sql/domain.sql
Unstaged changes after reset:
M	src/backend/rewrite/rewriteHandler.c
M	src/backend/utils/cache/typcache.c
M	src/include/utils/typcache.h
M	src/test/regress/expected/domain.out
M	src/test/regress/sql/domain.sql
Removing src/include/utils/typcache.h.rej
=== using 'git apply' to apply patch ./v1-0001-UPDATE-with-invalid-domain-constraint.patch ===
Applied patch to 'src/backend/rewrite/rewriteHandler.c' cleanly.
Applied patch to 'src/backend/utils/cache/typcache.c' cleanly.
Applied patch to 'src/include/utils/typcache.h' with conflicts.
Applied patch to 'src/test/regress/expected/domain.out' cleanly.
Applied patch to 'src/test/regress/sql/domain.sql' cleanly.
U src/include/utils/typcache.h
diff --cc src/include/utils/typcache.h
index 5a4aa9ec840,dcaff52b1b2..00000000000
--- a/src/include/utils/typcache.h
+++ b/src/include/utils/typcache.h
@@@ -183,7 -185,8 +185,12 @@@ extern void InitDomainConstraintRef(Oi
  
  extern void UpdateDomainConstraintRef(DomainConstraintRef *ref);
  
++<<<<<<< ours
 +extern bool DomainHasConstraints(Oid type_id, bool *has_volatile);
++=======
+ extern bool DomainHasConstraints(Oid type_id);
+ extern bool DomainHasInvalidConstraints(Oid type_id);
++>>>>>>> theirs
  
  extern TupleDesc lookup_rowtype_tupdesc(Oid type_id, int32 typmod);