=== Applying patches on top of PostgreSQL commit ID 8b529705d153f6bc592f874a9f2dd47be8fa0589 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Mon Nov  9 11:57:30 UTC 2026
On branch cf/7613
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v2-0001-pg_basebackup-Create-the-WAL-streaming-slot-befor.patch ===
Applying: pg_basebackup: Create the WAL streaming slot before starting the backup
Using index info to reconstruct a base tree...
M	src/bin/pg_basebackup/meson.build
Falling back to patching base and 3-way merge...
Auto-merging src/bin/pg_basebackup/meson.build
CONFLICT (content): Merge conflict in src/bin/pg_basebackup/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 pg_basebackup: Create the WAL streaming slot before starting the backup
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-0001-pg_basebackup-Create-the-WAL-streaming-slot-befor.patch ===
patching file src/bin/pg_basebackup/Makefile
patching file src/bin/pg_basebackup/meson.build
Hunk #1 FAILED at 96.
1 out of 1 hunk FAILED -- saving rejects to file src/bin/pg_basebackup/meson.build.rej
patching file src/bin/pg_basebackup/pg_basebackup.c
patching file src/bin/pg_basebackup/t/012_wal_slot_timing.pl
Unstaged changes after reset:
M	src/bin/pg_basebackup/Makefile
M	src/bin/pg_basebackup/pg_basebackup.c
Removing src/bin/pg_basebackup/meson.build.rej
Removing src/bin/pg_basebackup/t/012_wal_slot_timing.pl
=== using 'git apply' to apply patch ./v2-0001-pg_basebackup-Create-the-WAL-streaming-slot-befor.patch ===
Applied patch to 'src/bin/pg_basebackup/Makefile' cleanly.
Applied patch to 'src/bin/pg_basebackup/meson.build' with conflicts.
Applied patch to 'src/bin/pg_basebackup/pg_basebackup.c' cleanly.
Falling back to direct application...
U src/bin/pg_basebackup/meson.build
diff --cc src/bin/pg_basebackup/meson.build
index 2d3b22ff06e,c10a56512a0..00000000000
--- a/src/bin/pg_basebackup/meson.build
+++ b/src/bin/pg_basebackup/meson.build
@@@ -100,7 -101,7 +101,11 @@@ tests += 
      'tests': [
        't/010_pg_basebackup.pl',
        't/011_in_place_tablespace.pl',
++<<<<<<< ours
 +      't/012_incremental_progress.pl',
++=======
+       't/012_wal_slot_timing.pl',
++>>>>>>> theirs
        't/020_pg_receivewal.pl',
        't/030_pg_recvlogical.pl',
        't/040_pg_createsubscriber.pl',