=== Applying patches on top of PostgreSQL commit ID 0e944fe3579ecd525e5ffe7b7db4a7e1c34de49e ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Mon Aug 31 12:51:25 UTC 2026
On branch cf/7233
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v1-0001-Fix-WAL-recycle-race-in-pg_basebackup.patch ===
Applying: Fix WAL recycle race in pg_basebackup
.git/rebase-apply/patch:303: trailing whitespace.
#max_concurrent_backups = 10            # range 1-MAX_BACKENDS  
warning: 1 line adds whitespace errors.
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 Fix WAL recycle race in pg_basebackup
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-0001-Fix-WAL-recycle-race-in-pg_basebackup.patch ===
patching file src/backend/access/transam/xlog.c
patching file src/backend/access/transam/xlogbackup.c
patching file src/backend/backup/basebackup.c
patching file src/backend/utils/activity/wait_event_names.txt
patching file src/backend/utils/misc/guc_parameters.dat
patching file src/backend/utils/misc/postgresql.conf.sample
patching file src/include/access/xlogbackup.h
patching file src/include/storage/lwlocklist.h
patching file src/include/storage/subsystemlist.h
patching file src/test/recovery/meson.build
Hunk #1 FAILED at 64.
1 out of 1 hunk FAILED -- saving rejects to file src/test/recovery/meson.build.rej
patching file src/test/recovery/t/056_basebackup_slot_race.pl
Unstaged changes after reset:
M	src/backend/access/transam/xlog.c
M	src/backend/access/transam/xlogbackup.c
M	src/backend/backup/basebackup.c
M	src/backend/utils/activity/wait_event_names.txt
M	src/backend/utils/misc/guc_parameters.dat
M	src/backend/utils/misc/postgresql.conf.sample
M	src/include/access/xlogbackup.h
M	src/include/storage/lwlocklist.h
M	src/include/storage/subsystemlist.h
Removing src/test/recovery/meson.build.rej
Removing src/test/recovery/t/056_basebackup_slot_race.pl
=== using 'git apply' to apply patch ./v1-0001-Fix-WAL-recycle-race-in-pg_basebackup.patch ===
/work/patches/./v1-0001-Fix-WAL-recycle-race-in-pg_basebackup.patch:309: trailing whitespace.
#max_concurrent_backups = 10            # range 1-MAX_BACKENDS  
Applied patch to 'src/backend/access/transam/xlog.c' cleanly.
Applied patch to 'src/backend/access/transam/xlogbackup.c' cleanly.
Applied patch to 'src/backend/backup/basebackup.c' cleanly.
Applied patch to 'src/backend/utils/activity/wait_event_names.txt' cleanly.
Applied patch to 'src/backend/utils/misc/guc_parameters.dat' cleanly.
Applied patch to 'src/backend/utils/misc/postgresql.conf.sample' cleanly.
Applied patch to 'src/include/access/xlogbackup.h' cleanly.
Applied patch to 'src/include/storage/lwlocklist.h' cleanly.
Applied patch to 'src/include/storage/subsystemlist.h' cleanly.
Applied patch to 'src/test/recovery/meson.build' with conflicts.
Falling back to direct application...
U src/test/recovery/meson.build
warning: 1 line adds whitespace errors.
diff --cc src/test/recovery/meson.build
index 72113c5ac6e,b61bc60c000..00000000000
--- a/src/test/recovery/meson.build
+++ b/src/test/recovery/meson.build
@@@ -64,7 -64,7 +64,11 @@@ tests += 
        't/053_standby_login_event_trigger.pl',
        't/054_unlogged_sequence_promotion.pl',
        't/055_cascade_reconnect.pl',
++<<<<<<< ours
 +      't/056_standby_snapshot_export.pl',
++=======
+       't/056_basebackup_slot_race.pl',
++>>>>>>> theirs
      ],
    },
  }