=== Applying patches on top of PostgreSQL commit ID bd4bd30ce6a7f08e95390c3fa068f2bfbe9fcee8 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Tue Jun  9 04:59:26 UTC 2026
On branch cf/5323
nothing to commit, working tree clean
=== using 'git am' to apply patch ./0001-Fix-checksum-state-transition-during-promotion.patch ===
Applying: Fix checksum state transition during promotion
Using index info to reconstruct a base tree...
M	src/backend/access/transam/xlog.c
M	src/test/modules/test_checksums/t/003_standby_restarts.pl
Falling back to patching base and 3-way merge...
Auto-merging src/test/modules/test_checksums/t/003_standby_restarts.pl
CONFLICT (content): Merge conflict in src/test/modules/test_checksums/t/003_standby_restarts.pl
Auto-merging src/backend/access/transam/xlog.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 Fix checksum state transition during promotion
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 ./0001-Fix-checksum-state-transition-during-promotion.patch ===
patching file src/backend/access/transam/xlog.c
Hunk #1 FAILED at 6610.
Hunk #2 FAILED at 6621.
Hunk #3 succeeded at 4923 with fuzz 2 (offset -1706 lines).
2 out of 3 hunks FAILED -- saving rejects to file src/backend/access/transam/xlog.c.rej
patching file src/test/modules/test_checksums/t/003_standby_restarts.pl
Hunk #1 succeeded at 284 with fuzz 2 (offset 58 lines).
Unstaged changes after reset:
M	src/backend/access/transam/xlog.c
M	src/test/modules/test_checksums/t/003_standby_restarts.pl
Removing src/backend/access/transam/xlog.c.rej
=== using 'git apply' to apply patch ./0001-Fix-checksum-state-transition-during-promotion.patch ===
Applied patch to 'src/backend/access/transam/xlog.c' cleanly.
Applied patch to 'src/test/modules/test_checksums/t/003_standby_restarts.pl' with conflicts.
U src/test/modules/test_checksums/t/003_standby_restarts.pl
diff --cc src/test/modules/test_checksums/t/003_standby_restarts.pl
index bb35ed0b325,b1f8eedb0bf..00000000000
--- a/src/test/modules/test_checksums/t/003_standby_restarts.pl
+++ b/src/test/modules/test_checksums/t/003_standby_restarts.pl
@@@ -275,7 -275,7 +275,11 @@@ $node_primary->teardown_node()
  $node_standby->promote;
  wait_for_checksum_state($node_standby, 'off');
  
++<<<<<<< ours
 +# Ensure that the any backend which was active before, and during, promotion
++=======
+ # Ensure that the any backend which was active befire, and during, promotion
++>>>>>>> theirs
  # sees the new state.
  $result = $node_standby_bpsql->query_safe("SHOW data_checksums;");
  is($result, 'off',