=== Applying patches on top of PostgreSQL commit ID 901ed9b352b41f034e17bc540725082a488fce31 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sat May  9 13:07:23 UTC 2026
On branch cf/6055
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v8-0001-fix-DDL-wholerow-referenced-constraints-and-indexes.patch ===
Applying: fix DDL wholerow referenced constraints and indexes
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/indexing.out
M	src/test/regress/sql/constraints.sql
M	src/test/regress/sql/indexing.sql
Falling back to patching base and 3-way merge...
Auto-merging src/test/regress/sql/indexing.sql
Auto-merging src/test/regress/sql/constraints.sql
Auto-merging src/test/regress/expected/indexing.out
Auto-merging src/test/regress/expected/constraints.out
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 fix DDL wholerow referenced constraints and indexes
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 ./v8-0001-fix-DDL-wholerow-referenced-constraints-and-indexes.patch ===
patching file src/backend/commands/tablecmds.c
Hunk #1 FAILED at 745.
Hunk #2 succeeded at 9467 (offset 76 lines).
Hunk #3 succeeded at 9575 (offset 76 lines).
Hunk #4 succeeded at 15029 (offset 245 lines).
Hunk #5 succeeded at 15125 (offset 245 lines).
Hunk #6 succeeded at 23919 (offset 559 lines).
1 out of 6 hunks FAILED -- saving rejects to file src/backend/commands/tablecmds.c.rej
patching file src/test/regress/expected/constraints.out
patching file src/test/regress/expected/indexing.out
Hunk #1 succeeded at 759 (offset 105 lines).
patching file src/test/regress/sql/constraints.sql
patching file src/test/regress/sql/indexing.sql
Hunk #1 succeeded at 354 (offset 59 lines).
Unstaged changes after reset:
M	src/backend/commands/tablecmds.c
M	src/test/regress/expected/constraints.out
M	src/test/regress/expected/indexing.out
M	src/test/regress/sql/constraints.sql
M	src/test/regress/sql/indexing.sql
Removing src/backend/commands/tablecmds.c.rej
=== using 'git apply' to apply patch ./v8-0001-fix-DDL-wholerow-referenced-constraints-and-indexes.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/indexing.out' cleanly.
Applied patch to 'src/test/regress/sql/constraints.sql' cleanly.
Applied patch to 'src/test/regress/sql/indexing.sql' cleanly.
U src/backend/commands/tablecmds.c
diff --cc src/backend/commands/tablecmds.c
index 88451c91448,da43e9efed4..00000000000
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@@ -783,9 -745,9 +783,15 @@@ static void ATExecMergePartitions(List 
  static void ATExecSplitPartition(List **wqueue, AlteredTableInfo *tab,
  								 Relation rel, PartitionCmd *cmd,
  								 AlterTableUtilityContext *context);
++<<<<<<< ours
 +static List *collectPartitionIndexExtDeps(List *partitionOids);
 +static void applyPartitionIndexExtDeps(Oid newPartOid, List *extDepState);
 +static void freePartitionIndexExtDeps(List *extDepState);
++=======
+ static void recordWholeRowDependencyOnOrError(Relation rel,
+ 											  const ObjectAddress *object,
+ 											  bool error_out);
++>>>>>>> theirs
  
  /* ----------------------------------------------------------------
   *		DefineRelation