=== Applying patches on top of PostgreSQL commit ID 1a3e782e762248b4a63294936224458571a0eb5a ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Tue Sep 15 13:06:27 UTC 2026
On branch cf/7304
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v1-0001-Discard-aborted-updaters-in-MultiXactIdExpand.patch ===
Applying: Discard aborted updaters in MultiXactIdExpand()
=== using 'git am' to apply patch ./v1-0002-Test-multixact-expansion-during-updater-abort.patch ===
Applying: Test multixact expansion during updater abort
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
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
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 multixact expansion during updater abort
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 ./v1-0002-Test-multixact-expansion-during-updater-abort.patch ===
patching file src/backend/access/transam/xact.c
patching file src/test/modules/injection_points/Makefile
Hunk #1 FAILED at 26.
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/multixact-aborted-updater.out
patching file src/test/modules/injection_points/meson.build
Hunk #1 FAILED at 56.
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/multixact-aborted-updater.spec
Unstaged changes after reset:
M	src/backend/access/transam/xact.c
Removing src/test/modules/injection_points/Makefile.rej
Removing src/test/modules/injection_points/expected/multixact-aborted-updater.out
Removing src/test/modules/injection_points/meson.build.rej
Removing src/test/modules/injection_points/specs/multixact-aborted-updater.spec
=== using 'git apply' to apply patch ./v1-0002-Test-multixact-expansion-during-updater-abort.patch ===
Applied patch to 'src/backend/access/transam/xact.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 9d8b4b3540c,6c4d2e00647..00000000000
--- a/src/test/modules/injection_points/Makefile
+++ b/src/test/modules/injection_points/Makefile
@@@ -27,7 -27,7 +27,11 @@@ ISOLATION = basic 
  	    syscache-update-pruned \
  	    wait_cleanup \
  	    heap_lock_update \
++<<<<<<< ours
 +	    on_conflict_probe_window
++=======
+ 	    multixact-aborted-updater
++>>>>>>> theirs
  
  # some isolation tests require wal_level=replica
  ISOLATION_OPTS = --temp-config $(top_srcdir)/src/test/modules/injection_points/extra.conf
diff --cc src/test/modules/injection_points/meson.build
index 80a09f34d78,f506f4a2a44..00000000000
--- a/src/test/modules/injection_points/meson.build
+++ b/src/test/modules/injection_points/meson.build
@@@ -56,7 -56,7 +56,11 @@@ tests += 
        'syscache-update-pruned',
        'wait_cleanup',
        'heap_lock_update',
++<<<<<<< ours
 +      'on_conflict_probe_window',
++=======
+       'multixact-aborted-updater',
++>>>>>>> theirs
      ],
      'runningcheck': false, # see syscache-update-pruned
      # Some tests wait for all snapshots, so avoid parallel execution