=== Applying patches on top of PostgreSQL commit ID 18cdf5932a279a2c035d44460e1e0cbb659471f2 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sat Sep 20 16:42:18 UTC 2025
On branch cf/6029
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v1-0001-fix-CREATE-TABLE-LIKE-with-INVALID-CHECK-CONSTRAINT.patch ===
Applying: fix CREATE TABLE LIKE with INVALID CHECK CONSTRAINT
Using index info to reconstruct a base tree...
M	src/backend/parser/parse_utilcmd.c
M	src/test/regress/expected/create_table_like.out
M	src/test/regress/sql/create_table_like.sql
Falling back to patching base and 3-way merge...
Auto-merging src/backend/parser/parse_utilcmd.c
CONFLICT (content): Merge conflict in src/backend/parser/parse_utilcmd.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 CREATE TABLE LIKE with INVALID CHECK 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".
Unstaged changes after reset:
M	src/backend/parser/parse_utilcmd.c
=== using patch(1) to apply patch ./v1-0001-fix-CREATE-TABLE-LIKE-with-INVALID-CHECK-CONSTRAINT.patch ===
patching file src/backend/parser/parse_utilcmd.c
Hunk #1 FAILED at 1461.
Hunk #2 FAILED at 1492.
2 out of 2 hunks FAILED -- saving rejects to file src/backend/parser/parse_utilcmd.c.rej
patching file src/test/regress/expected/create_table_like.out
Hunk #1 FAILED at 320.
Hunk #2 FAILED at 378.
Hunk #3 FAILED at 387.
Hunk #4 FAILED at 409.
Hunk #5 FAILED at 430.
Hunk #6 FAILED at 456.
Hunk #7 FAILED at 499.
Hunk #8 FAILED at 524.
8 out of 8 hunks FAILED -- saving rejects to file src/test/regress/expected/create_table_like.out.rej
patching file src/test/regress/sql/create_table_like.sql
Hunk #1 FAILED at 130.
1 out of 1 hunk FAILED -- saving rejects to file src/test/regress/sql/create_table_like.sql.rej
Removing src/backend/parser/parse_utilcmd.c.rej
Removing src/test/regress/expected/create_table_like.out.rej
Removing src/test/regress/sql/create_table_like.sql.rej
=== using 'git apply' to apply patch ./v1-0001-fix-CREATE-TABLE-LIKE-with-INVALID-CHECK-CONSTRAINT.patch ===
Applied patch to 'src/backend/parser/parse_utilcmd.c' with conflicts.
Applied patch to 'src/test/regress/expected/create_table_like.out' cleanly.
Applied patch to 'src/test/regress/sql/create_table_like.sql' cleanly.
U src/backend/parser/parse_utilcmd.c
diff --cc src/backend/parser/parse_utilcmd.c
index e96b38a59d5,f8673a82c49..00000000000
--- a/src/backend/parser/parse_utilcmd.c
+++ b/src/backend/parser/parse_utilcmd.c
@@@ -1491,7 -1491,7 +1491,11 @@@ expandTableLikeClause(RangeVar *heapRel
  			n->conname = pstrdup(ccname);
  			n->location = -1;
  			n->is_enforced = ccenforced;
++<<<<<<< ours
 +			n->initially_valid = ccenforced;	/* sic */
++=======
+ 			n->initially_valid = ccenforced ? true : false;
++>>>>>>> theirs
  			n->is_no_inherit = ccnoinherit;
  			n->raw_expr = NULL;
  			n->cooked_expr = nodeToString(ccbin_node);