=== Applying patches on top of PostgreSQL commit ID e18b0cb7344cb4bd28468f6c0aeeb9b9241d30aa ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Wed Jun 10 06:26:22 UTC 2026
On branch cf/6037
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v3-0001-Fix-race-condition-when-reading-PredXact-SxactGlo.patch ===
Applying: Fix race condition when reading `PredXact->SxactGlobalXmin`
Using index info to reconstruct a base tree...
M	src/backend/storage/lmgr/predicate.c
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
CONFLICT (content): Merge conflict in 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
Auto-merging src/backend/storage/lmgr/predicate.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 race condition when reading `PredXact->SxactGlobalXmin`
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 ./v3-0001-Fix-race-condition-when-reading-PredXact-SxactGlo.patch ===
patching file src/backend/storage/lmgr/predicate.c
Hunk #1 succeeded at 210 with fuzz 2 (offset -2 lines).
Hunk #2 succeeded at 2879 (offset -82 lines).
Hunk #3 succeeded at 3082 (offset -82 lines).
Hunk #4 succeeded at 3188 (offset -82 lines).
Hunk #5 succeeded at 3305 (offset -82 lines).
Hunk #6 succeeded at 4364 (offset -82 lines).
patching file src/test/modules/injection_points/Makefile
Hunk #1 FAILED at 14.
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/predicate-lock-page-split.out
patching file src/test/modules/injection_points/meson.build
Hunk #1 FAILED at 45.
1 out of 1 hunk FAILED -- saving rejects to file src/test/modules/injection_points/meson.build.rej
patching file src/test/modules/injection_points/specs/predicate-lock-page-split.spec
Unstaged changes after reset:
M	src/backend/storage/lmgr/predicate.c
Removing src/test/modules/injection_points/Makefile.rej
Removing src/test/modules/injection_points/expected/predicate-lock-page-split.out
Removing src/test/modules/injection_points/meson.build.rej
Removing src/test/modules/injection_points/specs/predicate-lock-page-split.spec
=== using 'git apply' to apply patch ./v3-0001-Fix-race-condition-when-reading-PredXact-SxactGlo.patch ===
Applied patch to 'src/backend/storage/lmgr/predicate.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' with conflicts.
Falling back to direct application...
U src/test/modules/injection_points/Makefile
U src/test/modules/injection_points/meson.build
diff --cc src/test/modules/injection_points/Makefile
index c01d2fb095c,73ed09eaa22..00000000000
--- a/src/test/modules/injection_points/Makefile
+++ b/src/test/modules/injection_points/Makefile
@@@ -14,10 -14,7 +14,14 @@@ REGRESS_OPTS = --dlpath=$(top_builddir)
  
  ISOLATION = basic \
  	    inplace \
++<<<<<<< ours
 +	    repack \
 +	    repack_temporal \
 +	    repack_temporal_multirange \
 +	    repack_toast \
++=======
+ 	    predicate-lock-page-split \
++>>>>>>> theirs
  	    syscache-update-pruned \
  	    heap_lock_update
  
diff --cc src/test/modules/injection_points/meson.build
index 59dba1cb023,6ff7005a9bf..00000000000
--- a/src/test/modules/injection_points/meson.build
+++ b/src/test/modules/injection_points/meson.build
@@@ -45,10 -45,7 +45,14 @@@ tests += 
      'specs': [
        'basic',
        'inplace',
++<<<<<<< ours
 +      'repack',
 +      'repack_temporal',
 +      'repack_temporal_multirange',
 +      'repack_toast',
++=======
+       'predicate-lock-page-split',
++>>>>>>> theirs
        'syscache-update-pruned',
        'heap_lock_update',
      ],