=== Applying patches on top of PostgreSQL commit ID 02f699c1416380c0411fbc0f53061f86b2f52ed3 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sun Jun 28 12:31:30 UTC 2026
On branch cf/6827
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v11-0001-Prevent-inherited-CHECK-constraints-from-being-w.patch ===
Applying: Prevent inherited CHECK constraints from being weakened
Using index info to reconstruct a base tree...
M	src/backend/commands/tablecmds.c
M	src/test/regress/expected/constraints.out
M	src/test/regress/expected/inherit.out
M	src/test/regress/sql/constraints.sql
M	src/test/regress/sql/inherit.sql
Falling back to patching base and 3-way merge...
Auto-merging src/backend/commands/tablecmds.c
CONFLICT (content): Merge conflict in src/backend/commands/tablecmds.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 Prevent inherited CHECK constraints from being weakened
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-Prevent-inherited-CHECK-constraints-from-being-w.patch ===
patching file src/backend/commands/tablecmds.c
Hunk #1 FAILED at 437.
Hunk #2 FAILED at 459.
Hunk #3 FAILED at 466.
Hunk #4 FAILED at 477.
Hunk #5 FAILED at 12459.
Hunk #6 FAILED at 12646.
Hunk #7 FAILED at 12668.
Hunk #8 FAILED at 12690.
Hunk #9 FAILED at 12723.
Hunk #10 FAILED at 12763.
Hunk #11 FAILED at 12792.
11 out of 11 hunks FAILED -- saving rejects to file src/backend/commands/tablecmds.c.rej
patching file src/test/regress/expected/constraints.out
Hunk #1 FAILED at 446.
Hunk #2 FAILED at 457.
2 out of 2 hunks FAILED -- saving rejects to file src/test/regress/expected/constraints.out.rej
patching file src/test/regress/expected/inherit.out
Hunk #1 FAILED at 1479.
1 out of 1 hunk FAILED -- saving rejects to file src/test/regress/expected/inherit.out.rej
patching file src/test/regress/sql/constraints.sql
Hunk #1 FAILED at 309.
1 out of 1 hunk FAILED -- saving rejects to file src/test/regress/sql/constraints.sql.rej
patching file src/test/regress/sql/inherit.sql
Hunk #1 succeeded at 587 with fuzz 2 (offset 52 lines).
Unstaged changes after reset:
M	src/test/regress/sql/inherit.sql
Removing src/backend/commands/tablecmds.c.rej
Removing src/test/regress/expected/constraints.out.rej
Removing src/test/regress/expected/inherit.out.rej
Removing src/test/regress/sql/constraints.sql.rej
=== using 'git apply' to apply patch ./v11-0001-Prevent-inherited-CHECK-constraints-from-being-w.patch ===
Applied patch to 'src/backend/commands/tablecmds.c' with conflicts.
Applied patch to 'src/test/regress/expected/constraints.out' cleanly.
Applied patch to 'src/test/regress/expected/inherit.out' cleanly.
Applied patch to 'src/test/regress/sql/constraints.sql' cleanly.
Applied patch to 'src/test/regress/sql/inherit.sql' cleanly.
U src/backend/commands/tablecmds.c
diff --cc src/backend/commands/tablecmds.c
index 472db112fa7,599f77a7720..00000000000
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@@ -12779,11 -12779,7 +12779,15 @@@ ATExecAlterCheckConstrEnforceability(Li
  				 * Supported DDL ensures that inheritable CHECK constraints
  				 * with the same name have equivalent definitions when they
  				 * are propagated to children or when inheritance is
++<<<<<<< ours
 +				 * established.  All descendants returned by
 +				 * find_all_inheritors must have this constraint: inherited
 +				 * CHECK constraints propagate to all children at
 +				 * inheritance-link creation time and cannot be dropped
 +				 * independently on child tables.
++=======
+ 				 * established.
++>>>>>>> theirs
  				 */
  				if (!cmdcon->is_enforced)
  					changing_conids =
@@@ -12950,10 -12946,6 +12954,13 @@@ ATCheckCheckConstrHasEnforcedParent(Rel
  		pscan = systable_beginscan(conrel, ConstraintRelidTypidNameIndexId,
  								   true, NULL, 3, pkey);
  
++<<<<<<< ours
 +		/*
 +		 * ConstraintRelidTypidNameIndexId is unique on (conrelid, contypid,
 +		 * conname), so this loop body executes at most once per parent.
 +		 */
++=======
++>>>>>>> theirs
  		while (HeapTupleIsValid(parenttup = systable_getnext(pscan)))
  		{
  			Form_pg_constraint parentcon;