=== Applying patches on top of PostgreSQL commit ID 534db08f972852b77ea5e96e77d5fe45f3d8df93 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Thu Sep  3 18:14:25 UTC 2026
On branch cf/7117
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v4-0001-Disallow-directly-ALTER-TABLE-SET-EXPRESSION-on-child-table-if-de.patch ===
Applying: Disallow directly ALTER TABLE SET EXPRESSION on child table if dependency exists
Using index info to reconstruct a base tree...
M	src/backend/commands/tablecmds.c
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 Disallow directly ALTER TABLE SET EXPRESSION on child table if dependency exists
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 ./v4-0001-Disallow-directly-ALTER-TABLE-SET-EXPRESSION-on-child-table-if-de.patch ===
patching file src/backend/commands/tablecmds.c
Hunk #1 FAILED at 795.
Hunk #2 succeeded at 5098 (offset -36 lines).
Hunk #3 succeeded at 8836 (offset -62 lines).
1 out of 3 hunks FAILED -- saving rejects to file src/backend/commands/tablecmds.c.rej
patching file src/test/regress/expected/generated_stored.out
patching file src/test/regress/expected/generated_virtual.out
patching file src/test/regress/sql/generated_stored.sql
patching file src/test/regress/sql/generated_virtual.sql
Unstaged changes after reset:
M	src/backend/commands/tablecmds.c
M	src/test/regress/expected/generated_stored.out
M	src/test/regress/expected/generated_virtual.out
M	src/test/regress/sql/generated_stored.sql
M	src/test/regress/sql/generated_virtual.sql
Removing src/backend/commands/tablecmds.c.rej
=== using 'git apply' to apply patch ./v4-0001-Disallow-directly-ALTER-TABLE-SET-EXPRESSION-on-child-table-if-de.patch ===
Applied patch to 'src/backend/commands/tablecmds.c' with conflicts.
Applied patch to 'src/test/regress/expected/generated_stored.out' cleanly.
Applied patch to 'src/test/regress/expected/generated_virtual.out' cleanly.
Applied patch to 'src/test/regress/sql/generated_stored.sql' cleanly.
Applied patch to 'src/test/regress/sql/generated_virtual.sql' cleanly.
U src/backend/commands/tablecmds.c
diff --cc src/backend/commands/tablecmds.c
index fd144d783d9,cb57190129f..00000000000
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@@ -764,6 -787,17 +764,20 @@@ static void ATDetachCheckNoForeignKeyRe
  static char GetAttributeCompression(Oid atttypid, const char *compression);
  static char GetAttributeStorage(Oid atttypid, const char *storagemode);
  
++<<<<<<< ours
++=======
+ static void ATExecMergePartitions(List **wqueue, AlteredTableInfo *tab, Relation rel,
+ 								  PartitionCmd *cmd, AlterTableUtilityContext *context);
+ static void ATExecSplitPartition(List **wqueue, AlteredTableInfo *tab,
+ 								 Relation rel, PartitionCmd *cmd,
+ 								 AlterTableUtilityContext *context);
+ static List *collectPartitionIndexExtDeps(List *partitionOids);
+ static void applyPartitionIndexExtDeps(Oid newPartOid, List *extDepState);
+ static void freePartitionIndexExtDeps(List *extDepState);
+ static void ATPrepSetExpression(List **wqueue, AlteredTableInfo *tab, Relation rel,
+ 								AlterTableCmd *cmd, bool recurse, bool recursing,
+ 								LOCKMODE lockmode);
++>>>>>>> theirs
  
  /* ----------------------------------------------------------------
   *		DefineRelation