=== Applying patches on top of PostgreSQL commit ID 72af14bccd2127bf20ddeaf198b78de46e9e892b ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Tue Sep 15 23:46:28 UTC 2026
On branch cf/7213
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v5-0001-Fix-missing-SIREAD-lock-on-the-row-found-by-ON-CO.patch ===
Applying: Fix missing SIREAD lock on the row found by ON CONFLICT.
Using index info to reconstruct a base tree...
M	src/backend/executor/execIndexing.c
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/backend/executor/execIndexing.c
CONFLICT (content): Merge conflict in src/backend/executor/execIndexing.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 missing SIREAD lock on the row found by ON CONFLICT.
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 ./v5-0001-Fix-missing-SIREAD-lock-on-the-row-found-by-ON-CO.patch ===
patching file src/backend/executor/execIndexing.c
Hunk #3 FAILED at 837.
Hunk #4 succeeded at 893 (offset 1 line).
1 out of 4 hunks FAILED -- saving rejects to file src/backend/executor/execIndexing.c.rej
patching file src/backend/storage/lmgr/predicate.c
patching file src/backend/utils/time/snapmgr.c
patching file src/include/utils/snapmgr.h
The next patch would create the file src/test/isolation/expected/insert-conflict-serializable.out,
which already exists!  Skipping patch.
1 out of 1 hunk ignored
patching file src/test/isolation/isolation_schedule
Hunk #1 FAILED at 58.
1 out of 1 hunk FAILED -- saving rejects to file src/test/isolation/isolation_schedule.rej
The next patch would create the file src/test/isolation/specs/insert-conflict-serializable.spec,
which already exists!  Skipping patch.
1 out of 1 hunk ignored
Unstaged changes after reset:
M	src/backend/executor/execIndexing.c
M	src/backend/storage/lmgr/predicate.c
M	src/backend/utils/time/snapmgr.c
M	src/include/utils/snapmgr.h
Removing src/backend/executor/execIndexing.c.rej
Removing src/test/isolation/isolation_schedule.rej
=== using 'git apply' to apply patch ./v5-0001-Fix-missing-SIREAD-lock-on-the-row-found-by-ON-CO.patch ===
Applied patch to 'src/backend/executor/execIndexing.c' with conflicts.
Applied patch to 'src/backend/storage/lmgr/predicate.c' cleanly.
Applied patch to 'src/backend/utils/time/snapmgr.c' cleanly.
Applied patch to 'src/include/utils/snapmgr.h' cleanly.
Performing three-way merge...
Applied patch to 'src/test/isolation/expected/insert-conflict-serializable.out' cleanly.
Applied patch to 'src/test/isolation/isolation_schedule' cleanly.
Performing three-way merge...
Applied patch to 'src/test/isolation/specs/insert-conflict-serializable.spec' cleanly.
U src/backend/executor/execIndexing.c
diff --cc src/backend/executor/execIndexing.c
index d0a714a42f2,68ab117cbb4..00000000000
--- a/src/backend/executor/execIndexing.c
+++ b/src/backend/executor/execIndexing.c
@@@ -823,8 -836,8 +836,13 @@@ check_exclusion_or_unique_constraint(Re
  retry:
  	conflict = false;
  	found_self = false;
++<<<<<<< ours
 +	index_scan = index_beginscan(heap, index, false,
 +								 &DirtySnapshot, NULL, indnkeyatts, 0,
++=======
+ 	index_scan = index_beginscan(heap, index,
+ 								 snapshot, NULL, indnkeyatts, 0,
++>>>>>>> theirs
  								 SO_NONE);
  	index_rescan(index_scan, scankeys, indnkeyatts, NULL, 0);