=== Applying patches on top of PostgreSQL commit ID b7057e43467ff2d7c04c3abcf5ec35fcc7db9611 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Mon Dec 29 15:53:19 UTC 2025
On branch cf/5444
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v7-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/backend/executor/execIndexing.c
M	src/include/executor/executor.h
M	src/test/isolation/isolation_schedule
Falling back to patching base and 3-way merge...
Auto-merging src/test/isolation/isolation_schedule
Auto-merging src/include/executor/executor.h
Auto-merging src/backend/executor/execIndexing.c
CONFLICT (content): Merge conflict in src/backend/executor/execIndexing.c
Auto-merging 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".
Unstaged changes after reset:
M	src/backend/commands/tablecmds.c
M	src/backend/executor/execIndexing.c
M	src/include/executor/executor.h
M	src/test/isolation/isolation_schedule
M	src/test/modules/test_misc/meson.build
Removing src/test/isolation/expected/indexscan-check-notnull.out
Removing src/test/isolation/specs/indexscan-check-notnull.spec
Removing src/test/modules/test_misc/t/010_indexscan_validate_notnull.pl
=== using patch(1) to apply patch ./v7-0001-using-indexscan-to-speedup-add-not-null-constraints.patch ===
patching file src/backend/commands/tablecmds.c
Hunk #2 succeeded at 6219 (offset 32 lines).
Hunk #3 succeeded at 6275 (offset 32 lines).
Hunk #4 succeeded at 8019 (offset 36 lines).
Hunk #5 succeeded at 8144 (offset 36 lines).
Hunk #6 FAILED at 10013.
Hunk #7 succeeded at 13349 (offset 61 lines).
Hunk #8 succeeded at 13413 (offset 61 lines).
1 out of 8 hunks FAILED -- saving rejects to file src/backend/commands/tablecmds.c.rej
patching file src/backend/executor/execIndexing.c
Hunk #1 FAILED at 108.
Hunk #2 succeeded at 146 (offset 1 line).
Hunk #3 succeeded at 1179 (offset 6 lines).
1 out of 3 hunks FAILED -- saving rejects to file src/backend/executor/execIndexing.c.rej
patching file src/include/executor/executor.h
Hunk #1 succeeded at 756 (offset 3 lines).
patching file src/test/isolation/expected/indexscan-check-notnull.out
patching file src/test/isolation/isolation_schedule
Hunk #1 succeeded at 58 (offset -1 lines).
patching file src/test/isolation/specs/indexscan-check-notnull.spec
patching file src/test/modules/test_misc/meson.build
patching file src/test/modules/test_misc/t/010_indexscan_validate_notnull.pl
Unstaged changes after reset:
M	src/backend/commands/tablecmds.c
M	src/backend/executor/execIndexing.c
M	src/include/executor/executor.h
M	src/test/isolation/isolation_schedule
M	src/test/modules/test_misc/meson.build
Removing src/backend/commands/tablecmds.c.rej
Removing src/backend/executor/execIndexing.c.rej
Removing src/test/isolation/expected/indexscan-check-notnull.out
Removing src/test/isolation/specs/indexscan-check-notnull.spec
Removing src/test/modules/test_misc/t/010_indexscan_validate_notnull.pl
=== using 'git apply' to apply patch ./v7-0001-using-indexscan-to-speedup-add-not-null-constraints.patch ===
Applied patch to 'src/backend/commands/tablecmds.c' cleanly.
Applied patch to 'src/backend/executor/execIndexing.c' with conflicts.
Applied patch to 'src/include/executor/executor.h' cleanly.
Falling back to direct application...
Applied patch to 'src/test/isolation/isolation_schedule' cleanly.
Falling back to direct application...
Applied patch to 'src/test/modules/test_misc/meson.build' cleanly.
Falling back to direct application...
U src/backend/executor/execIndexing.c
diff --cc src/backend/executor/execIndexing.c
index 0b3a31f1703,7cb539a7bcf..00000000000
--- a/src/backend/executor/execIndexing.c
+++ b/src/backend/executor/execIndexing.c
@@@ -114,7 -116,7 +116,11 @@@
  #include "executor/executor.h"
  #include "nodes/nodeFuncs.h"
  #include "storage/lmgr.h"
++<<<<<<< ours
 +#include "utils/injection_point.h"
++=======
+ #include "utils/fmgroids.h"
++>>>>>>> theirs
  #include "utils/multirangetypes.h"
  #include "utils/rangetypes.h"
  #include "utils/snapmgr.h"