=== Applying patches on top of PostgreSQL commit ID 07961ef86625be91e243f1dff8911cb1d70e443f ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Fri Nov  7 17:20:22 UTC 2025
On branch cf/6082
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v6-0001-Add-stats-related-to-slot-sync-skip.patch ===
Applying: Add stats related to slot sync skip
=== using 'git am' to apply patch ./v6-0002-Add-test-for-new-stats-for-slot-sync-skip.patch ===
Applying: Add test for new stats for slot sync skip
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 Add test for new stats for slot sync skip
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".
Unstaged changes after reset:
M	src/test/recovery/meson.build
Removing src/test/recovery/t/049_slot_skip_stats.pl
=== using patch(1) to apply patch ./v6-0002-Add-test-for-new-stats-for-slot-sync-skip.patch ===
patching file src/test/recovery/meson.build
Hunk #1 FAILED at 56.
1 out of 1 hunk FAILED -- saving rejects to file src/test/recovery/meson.build.rej
patching file src/test/recovery/t/049_slot_skip_stats.pl
Removing src/test/recovery/meson.build.rej
Removing src/test/recovery/t/049_slot_skip_stats.pl
=== using 'git apply' to apply patch ./v6-0002-Add-test-for-new-stats-for-slot-sync-skip.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 523a5cd5b52,83a6c4b5c17..00000000000
--- a/src/test/recovery/meson.build
+++ b/src/test/recovery/meson.build
@@@ -57,7 -57,7 +57,11 @@@ tests += 
        't/046_checkpoint_logical_slot.pl',
        't/047_checkpoint_physical_slot.pl',
        't/048_vacuum_horizon_floor.pl',
++<<<<<<< ours
 +      't/049_wait_for_lsn.pl',
++=======
+       't/049_slot_skip_stats.pl'
++>>>>>>> theirs
      ],
    },
  }