=== Applying patches on top of PostgreSQL commit ID 19b966243c38196a33b033fb0c259dcf760c0d69 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Tue Dec  2 03:54:21 UTC 2025
On branch cf/5160
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v16-0001-Modify-the-ExecInitPartitionInfo-function-to-con.patch ===
Applying: Modify the ExecInitPartitionInfo function to consider partitioned indexes that are potentially processed by REINDEX CONCURRENTLY as arbiters as well.
Using index info to reconstruct a base tree...
M	src/test/modules/injection_points/Makefile
M	src/test/modules/injection_points/meson.build
Falling back to patching base and 3-way merge...
Auto-merging src/test/modules/injection_points/meson.build
Auto-merging src/test/modules/injection_points/Makefile
CONFLICT (content): Merge conflict in src/test/modules/injection_points/Makefile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Modify the ExecInitPartitionInfo function to consider partitioned indexes that are potentially processed by REINDEX CONCURRENTLY as arbiters as well.
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/executor/execPartition.c
M	src/test/modules/injection_points/Makefile
M	src/test/modules/injection_points/meson.build
Removing src/test/modules/injection_points/expected/reindex-concurrently-upsert-partitioned.out
Removing src/test/modules/injection_points/specs/reindex-concurrently-upsert-partitioned.spec
=== using patch(1) to apply patch ./v16-0001-Modify-the-ExecInitPartitionInfo-function-to-con.patch ===
patching file src/backend/executor/execPartition.c
patching file src/test/modules/injection_points/Makefile
Hunk #1 FAILED at 19.
1 out of 1 hunk FAILED -- saving rejects to file src/test/modules/injection_points/Makefile.rej
patching file src/test/modules/injection_points/expected/reindex-concurrently-upsert-partitioned.out
patching file src/test/modules/injection_points/meson.build
Hunk #1 succeeded at 52 with fuzz 2 (offset 1 line).
patching file src/test/modules/injection_points/specs/reindex-concurrently-upsert-partitioned.spec
Unstaged changes after reset:
M	src/backend/executor/execPartition.c
M	src/test/modules/injection_points/meson.build
Removing src/test/modules/injection_points/Makefile.rej
Removing src/test/modules/injection_points/expected/reindex-concurrently-upsert-partitioned.out
Removing src/test/modules/injection_points/specs/reindex-concurrently-upsert-partitioned.spec
=== using 'git apply' to apply patch ./v16-0001-Modify-the-ExecInitPartitionInfo-function-to-con.patch ===
Applied patch to 'src/backend/executor/execPartition.c' cleanly.
Applied patch to 'src/test/modules/injection_points/Makefile' with conflicts.
Falling back to direct application...
Applied patch to 'src/test/modules/injection_points/meson.build' cleanly.
Falling back to direct application...
U src/test/modules/injection_points/Makefile
diff --cc src/test/modules/injection_points/Makefile
index 0a9716db27c,e10475d2665..00000000000
--- a/src/test/modules/injection_points/Makefile
+++ b/src/test/modules/injection_points/Makefile
@@@ -19,8 -19,8 +19,13 @@@ ISOLATION = basic 
  	    syscache-update-pruned \
  	    index-concurrently-upsert \
  	    reindex-concurrently-upsert \
++<<<<<<< ours
 +	    reindex-concurrently-upsert-on-constraint \
 +	    index-concurrently-upsert-predicate
++=======
+ 	    index-concurrently-upsert-predicate \
+ 	    reindex-concurrently-upsert-partitioned
++>>>>>>> theirs
  
  TAP_TESTS = 1