=== Applying patches on top of PostgreSQL commit ID 80707c10456f3b29202899c62619b4a8d81fe8f9 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Tue Oct  6 01:59:31 UTC 2026
On branch cf/7121
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v2-0001-Pause-recovery-before-invalidating-logical-slots.patch ===
Applying: Pause recovery before invalidating logical slots
=== using 'git am' to apply patch ./v2-0002-Test-recovery-pause-on-logical-slot-conflict.patch ===
Applying: Test recovery pause on logical slot conflict
Using index info to reconstruct a base tree...
M	src/test/recovery/meson.build
Falling back to patching base and 3-way merge...
Auto-merging src/test/recovery/meson.build
CONFLICT (content): Merge conflict in src/test/recovery/meson.build
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 recovery pause on logical slot 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 ./v2-0002-Test-recovery-pause-on-logical-slot-conflict.patch ===
patching file src/test/recovery/meson.build
Hunk #1 FAILED at 65.
1 out of 1 hunk FAILED -- saving rejects to file src/test/recovery/meson.build.rej
patching file src/test/recovery/t/057_recovery_pause_on_slot_conflict.pl
Removing src/test/recovery/meson.build.rej
Removing src/test/recovery/t/057_recovery_pause_on_slot_conflict.pl
=== using 'git apply' to apply patch ./v2-0002-Test-recovery-pause-on-logical-slot-conflict.patch ===
Applied patch to 'src/test/recovery/meson.build' with conflicts.
Falling back to direct application...
U src/test/recovery/meson.build
diff --cc src/test/recovery/meson.build
index ebb12dd8766,286c7267b56..00000000000
--- a/src/test/recovery/meson.build
+++ b/src/test/recovery/meson.build
@@@ -65,7 -65,7 +65,11 @@@ tests += 
        't/054_unlogged_sequence_promotion.pl',
        't/055_cascade_reconnect.pl',
        't/056_standby_snapshot_export.pl',
++<<<<<<< ours
 +      't/057_snapshot_commit_race.pl',
++=======
+       't/057_recovery_pause_on_slot_conflict.pl',
++>>>>>>> theirs
      ],
    },
  }