=== Applying patches on top of PostgreSQL commit ID 9d33a5a804db48b254de7a0ad2fde03152f378e3 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Thu Jun 11 06:09:24 UTC 2026
On branch cf/6487
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v3-0001-Pipelined-Recovery-Producer.patch ===
Applying: Pipelined Recovery - Producer
Using index info to reconstruct a base tree...
M	src/backend/access/transam/xlogrecovery.c
M	src/backend/postmaster/bgworker.c
M	src/backend/utils/misc/guc_parameters.dat
M	src/backend/utils/misc/postgresql.conf.sample
M	src/include/access/xlog.h
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
Auto-merging src/include/access/xlog.h
Auto-merging src/backend/utils/misc/postgresql.conf.sample
Auto-merging src/backend/utils/misc/guc_parameters.dat
Auto-merging src/backend/postmaster/bgworker.c
Auto-merging src/backend/access/transam/xlogrecovery.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Pipelined Recovery - Producer
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 ./v3-0001-Pipelined-Recovery-Producer.patch ===
patching file src/backend/access/transam/Makefile
patching file src/backend/access/transam/meson.build
patching file src/backend/access/transam/xlogpipeline.c
patching file src/backend/access/transam/xlogrecovery.c
Hunk #4 succeeded at 4734 (offset 3 lines).
patching file src/backend/postmaster/bgworker.c
patching file src/backend/utils/misc/guc_parameters.dat
Hunk #1 succeeded at 3508 (offset 46 lines).
patching file src/backend/utils/misc/postgresql.conf.sample
Hunk #1 succeeded at 288 (offset 8 lines).
patching file src/include/access/xlog.h
patching file src/include/access/xlogpipeline.h
patching file src/include/access/xlogrecovery.h
patching file src/include/storage/subsystemlist.h
patching file src/test/recovery/meson.build
Hunk #1 FAILED at 61.
1 out of 1 hunk FAILED -- saving rejects to file src/test/recovery/meson.build.rej
patching file src/test/recovery/t/053_walpipeline.pl
Unstaged changes after reset:
M	src/backend/access/transam/Makefile
M	src/backend/access/transam/meson.build
M	src/backend/access/transam/xlogrecovery.c
M	src/backend/postmaster/bgworker.c
M	src/backend/utils/misc/guc_parameters.dat
M	src/backend/utils/misc/postgresql.conf.sample
M	src/include/access/xlog.h
M	src/include/access/xlogrecovery.h
M	src/include/storage/subsystemlist.h
Removing src/backend/access/transam/xlogpipeline.c
Removing src/include/access/xlogpipeline.h
Removing src/test/recovery/meson.build.rej
Removing src/test/recovery/t/053_walpipeline.pl
=== using 'git apply' to apply patch ./v3-0001-Pipelined-Recovery-Producer.patch ===
Applied patch to 'src/backend/access/transam/Makefile' cleanly.
Applied patch to 'src/backend/access/transam/meson.build' cleanly.
Falling back to direct application...
Applied patch to 'src/backend/access/transam/xlogrecovery.c' cleanly.
Applied patch to 'src/backend/postmaster/bgworker.c' 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/xlog.h' cleanly.
Falling back to direct application...
Applied patch to 'src/include/access/xlogrecovery.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
diff --cc src/test/recovery/meson.build
index 9eb8ed11425,fc23acbaec2..00000000000
--- a/src/test/recovery/meson.build
+++ b/src/test/recovery/meson.build
@@@ -61,7 -61,7 +61,11 @@@ tests += 
        't/050_redo_segment_missing.pl',
        't/051_effective_wal_level.pl',
        't/052_checkpoint_segment_missing.pl',
++<<<<<<< ours
 +      't/053_standby_login_event_trigger.pl',
++=======
+       't/053_walpipeline.pl',
++>>>>>>> theirs
      ],
    },
  }