=== Applying patches on top of PostgreSQL commit ID 2670cc298f42cd7b1c426bf7ccfb0652d8e0b347 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Fri May 29 15:47:22 UTC 2026
On branch cf/5444
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v14-0001-using-indexscan-to-speedup-add-not-null-constraints.patch ===
Applying: using indexscan to speedup add not null constraints
Using index info to reconstruct a base tree...
M	src/backend/commands/tablecmds.c
M	src/test/modules/test_misc/meson.build
Falling back to patching base and 3-way merge...
Auto-merging src/test/modules/test_misc/meson.build
CONFLICT (content): Merge conflict in src/test/modules/test_misc/meson.build
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 using indexscan to speedup add not null constraints
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 ./v14-0001-using-indexscan-to-speedup-add-not-null-constraints.patch ===
patching file src/backend/commands/tablecmds.c
Hunk #1 succeeded at 213 (offset 2 lines).
Hunk #2 FAILED at 763.
Hunk #3 succeeded at 6280 (offset 26 lines).
Hunk #4 succeeded at 6310 (offset 26 lines).
Hunk #5 succeeded at 6392 (offset 26 lines).
Hunk #6 succeeded at 6410 (offset 26 lines).
Hunk #7 succeeded at 8116 (offset 26 lines).
Hunk #8 succeeded at 8245 (offset 26 lines).
Hunk #9 succeeded at 10157 (offset 26 lines).
Hunk #10 succeeded at 13612 (offset 35 lines).
Hunk #11 succeeded at 13676 (offset 35 lines).
Hunk #12 succeeded at 24023 (offset 303 lines).
1 out of 12 hunks FAILED -- saving rejects to file src/backend/commands/tablecmds.c.rej
patching file src/test/modules/test_misc/meson.build
Hunk #1 FAILED at 20.
1 out of 1 hunk FAILED -- saving rejects to file src/test/modules/test_misc/meson.build.rej
patching file src/test/modules/test_misc/t/012_indexscan_validate_notnull.pl
Unstaged changes after reset:
M	src/backend/commands/tablecmds.c
Removing src/backend/commands/tablecmds.c.rej
Removing src/test/modules/test_misc/meson.build.rej
Removing src/test/modules/test_misc/t/012_indexscan_validate_notnull.pl
=== using 'git apply' to apply patch ./v14-0001-using-indexscan-to-speedup-add-not-null-constraints.patch ===
Applied patch to 'src/backend/commands/tablecmds.c' with conflicts.
Applied patch to 'src/test/modules/test_misc/meson.build' with conflicts.
Falling back to direct application...
U src/backend/commands/tablecmds.c
U src/test/modules/test_misc/meson.build
diff --cc src/backend/commands/tablecmds.c
index a1845240a98,178ac5f2a9b..00000000000
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@@ -783,9 -763,7 +786,13 @@@ 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 bool index_check_notnull(Relation relation, List *notnull_attnums);
++>>>>>>> theirs
  
  /* ----------------------------------------------------------------
   *		DefineRelation
diff --cc src/test/modules/test_misc/meson.build
index 969e90b396d,e02a2cb0c42..00000000000
--- a/src/test/modules/test_misc/meson.build
+++ b/src/test/modules/test_misc/meson.build
@@@ -20,8 -20,7 +20,12 @@@ tests += 
        't/009_log_temp_files.pl',
        't/010_index_concurrently_upsert.pl',
        't/011_lock_stats.pl',
++<<<<<<< ours
 +      't/012_ddlutils.pl',
 +      't/013_temp_obj_multisession.pl',
++=======
+       't/012_indexscan_validate_notnull.pl',
++>>>>>>> theirs
      ],
      # The injection points are cluster-wide, so disable installcheck
      'runningcheck': false,