=== Applying patches on top of PostgreSQL commit ID 3138f248cd3de43dd0f96760fc666152ea8a5c37 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Mon Oct 19 04:20:27 UTC 2026
On branch cf/7480
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v1-walreceiver-Do-not-leave-stale-xmin-on-primary-when-status-interval-is-zero-Master.patch ===
Applying: walreceiver: Do not leave stale xmin on primary when status interval is zero
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 walreceiver: Do not leave stale xmin on primary when status interval is zero
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-walreceiver-Do-not-leave-stale-xmin-on-primary-when-status-interval-is-zero-Master.patch ===
patching file src/backend/replication/walreceiver.c
patching file src/test/recovery/meson.build
Hunk #1 FAILED at 68.
1 out of 1 hunk FAILED -- saving rejects to file src/test/recovery/meson.build.rej
patching file src/test/recovery/t/060_hot_standby_feedback_status_interval.pl
Unstaged changes after reset:
M	src/backend/replication/walreceiver.c
Removing src/test/recovery/meson.build.rej
Removing src/test/recovery/t/060_hot_standby_feedback_status_interval.pl
=== using 'git apply' to apply patch ./v1-walreceiver-Do-not-leave-stale-xmin-on-primary-when-status-interval-is-zero-Master.patch ===
Applied patch to 'src/backend/replication/walreceiver.c' 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 b6ac9dd07a7,7f751e0195f..00000000000
--- a/src/test/recovery/meson.build
+++ b/src/test/recovery/meson.build
@@@ -68,7 -68,7 +68,11 @@@ tests += 
        't/057_snapshot_commit_race.pl',
        't/058_shutdown_crash_restart.pl',
        't/059_remote_apply_status_interval.pl',
++<<<<<<< ours
 +      't/060_multixact_crashed_updater.pl',
++=======
+       't/060_hot_standby_feedback_status_interval.pl',
++>>>>>>> theirs
      ],
    },
  }