=== Applying patches on top of PostgreSQL commit ID 87762cbaa4fefa2911c156f73f585b3ba522bab0 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Fri Sep 25 21:50:57 UTC 2026
On branch cf/6840
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v6-0001-Wait-for-the-transactions-of-an-initial-decoding-.patch ===
Applying: Wait for the transactions of an initial decoding snapshot to finish
=== using 'git am' to apply patch ./v6-0002-Test-the-initial-decoding-snapshot-against-a-comm.patch ===
Applying: Test the initial decoding snapshot against a commit that is not in CLOG yet
Using index info to reconstruct a base tree...
M	src/backend/access/transam/xact.c
M	src/test/modules/injection_points/Makefile
M	src/test/modules/injection_points/injection_points.c
M	src/test/modules/injection_points/meson.build
Falling back to patching base and 3-way merge...
CONFLICT (add/add): Merge conflict in src/test/modules/injection_points/specs/repack_commit_race.spec
Auto-merging src/test/modules/injection_points/specs/repack_commit_race.spec
Auto-merging src/test/modules/injection_points/meson.build
Auto-merging 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 Test the initial decoding snapshot against a commit that is not in CLOG yet
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 ./v6-0002-Test-the-initial-decoding-snapshot-against-a-comm.patch ===
patching file src/backend/access/transam/xact.c
Hunk #1 FAILED at 65.
Hunk #2 succeeded at 1381 with fuzz 2 (offset 4 lines).
Hunk #3 succeeded at 1550 with fuzz 2 (offset 4 lines).
1 out of 3 hunks FAILED -- saving rejects to file src/backend/access/transam/xact.c.rej
patching file src/test/modules/injection_points/Makefile
Hunk #1 FAILED at 18.
1 out of 1 hunk FAILED -- saving rejects to file src/test/modules/injection_points/Makefile.rej
The next patch would create the file src/test/modules/injection_points/expected/repack_commit_race.out,
which already exists!  Skipping patch.
1 out of 1 hunk ignored
patching file src/test/modules/injection_points/injection_points.c
Hunk #1 FAILED at 246.
1 out of 1 hunk FAILED -- saving rejects to file src/test/modules/injection_points/injection_points.c.rej
patching file src/test/modules/injection_points/meson.build
Hunk #1 FAILED at 47.
1 out of 1 hunk FAILED -- saving rejects to file src/test/modules/injection_points/meson.build.rej
The next patch would create the file src/test/modules/injection_points/specs/repack_commit_race.spec,
which already exists!  Skipping patch.
1 out of 1 hunk ignored
Unstaged changes after reset:
M	src/backend/access/transam/xact.c
Removing src/backend/access/transam/xact.c.rej
Removing src/test/modules/injection_points/Makefile.rej
Removing src/test/modules/injection_points/injection_points.c.rej
Removing src/test/modules/injection_points/meson.build.rej
=== using 'git apply' to apply patch ./v6-0002-Test-the-initial-decoding-snapshot-against-a-comm.patch ===
Applied patch to 'src/backend/access/transam/xact.c' cleanly.
Applied patch to 'src/test/modules/injection_points/Makefile' cleanly.
Performing three-way merge...
Applied patch to 'src/test/modules/injection_points/expected/repack_commit_race.out' cleanly.
Applied patch to 'src/test/modules/injection_points/injection_points.c' cleanly.
Applied patch to 'src/test/modules/injection_points/meson.build' cleanly.
Performing three-way merge...
Applied patch to 'src/test/modules/injection_points/specs/repack_commit_race.spec' with conflicts.
U src/test/modules/injection_points/specs/repack_commit_race.spec
diff --cc src/test/modules/injection_points/specs/repack_commit_race.spec
index 9926a45839e,a961d1c001d..00000000000
--- a/src/test/modules/injection_points/specs/repack_commit_race.spec
+++ b/src/test/modules/injection_points/specs/repack_commit_race.spec
@@@ -1,8 -1,9 +1,17 @@@
++<<<<<<< ours
 +# Test that the logical decoding initial snapshot build, used for
 +# REPACK (CONCURRENTLY), waits for transactions to remove themselves
 +# from ProcArray.  Transactions are initially considered committed when
 +# their commit WAL records are decoded, but that's not sufficient
 +# for MVCC correctness.
++=======
+ # REPACK (CONCURRENTLY) takes its initial snapshot from the logical decoding
+ # snapshot builder, which counts a transaction as committed as soon as it has
+ # decoded its commit record.  The transaction itself may still be between
+ # writing that record and updating CLOG.  The snapshot must not be used before
+ # the transaction has finished committing, or the copy of the table takes it
+ # as aborted and its changes are lost: decoding starts after its commit record.
++>>>>>>> theirs
  setup
  {
  	CREATE EXTENSION injection_points;