=== Applying patches on top of PostgreSQL commit ID e76defbcf09e22941d8cea462e2deef36d43fa04 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Mon Nov 17 03:39:20 UTC 2025
On branch cf/6206
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v2-0001-Fix-timing-issue-in-recovery-004_timeline_switch-.patch ===
Applying: Fix timing issue in recovery/004_timeline_switch test
Using index info to reconstruct a base tree...
M	src/test/recovery/t/004_timeline_switch.pl
Falling back to patching base and 3-way merge...
Auto-merging src/test/recovery/t/004_timeline_switch.pl
CONFLICT (content): Merge conflict in src/test/recovery/t/004_timeline_switch.pl
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 timing issue in recovery/004_timeline_switch test
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/t/004_timeline_switch.pl
=== using patch(1) to apply patch ./v2-0001-Fix-timing-issue-in-recovery-004_timeline_switch-.patch ===
patching file src/test/recovery/t/004_timeline_switch.pl
Hunk #1 FAILED at 54.
Hunk #2 succeeded at 77 (offset 11 lines).
1 out of 2 hunks FAILED -- saving rejects to file src/test/recovery/t/004_timeline_switch.pl.rej
Unstaged changes after reset:
M	src/test/recovery/t/004_timeline_switch.pl
Removing src/test/recovery/t/004_timeline_switch.pl.rej
=== using 'git apply' to apply patch ./v2-0001-Fix-timing-issue-in-recovery-004_timeline_switch-.patch ===
Applied patch to 'src/test/recovery/t/004_timeline_switch.pl' with conflicts.
U src/test/recovery/t/004_timeline_switch.pl
diff --cc src/test/recovery/t/004_timeline_switch.pl
index 4cceb5fd566,7a855d68a5d..00000000000
--- a/src/test/recovery/t/004_timeline_switch.pl
+++ b/src/test/recovery/t/004_timeline_switch.pl
@@@ -55,18 -55,13 +55,26 @@@ $node_standby_2->append_conf
  primary_conninfo='$connstr_1'
  ));
  
++<<<<<<< ours
 +# Rotate logfile before restarting, for the log checks done below.
 +$node_standby_2->rotate_logfile;
++=======
+ # Rotate to a fresh log file before restart.  The restart will kill
+ # walreceiver (logging a FATAL to the old file), but the new server
+ # will log to the new file.  This way we can check only the new file
+ # for issues during the timeline switch.
+ $node_standby_2->rotate_logfile();
++>>>>>>> theirs
  $node_standby_2->restart;
  
 +# Wait for walreceiver to reconnect after the restart.  We want to
 +# verify that after reconnection, the walreceiver stays alive during
 +# the timeline switch.
 +$node_standby_2->poll_query_until('postgres',
 +	"SELECT EXISTS(SELECT 1 FROM pg_stat_wal_receiver)");
 +my $wr_pid_before_switch = $node_standby_2->safe_psql('postgres',
 +	"SELECT pid FROM pg_stat_wal_receiver");
 +
  # Insert some data in standby 1 and check its presence in standby 2
  # to ensure that the timeline switch has been done.
  $node_standby_1->safe_psql('postgres',