=== Applying patches on top of PostgreSQL commit ID df335618ed87eecdef44a95e453e345a55a14ad8 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Thu Jul 24 06:34:22 UTC 2025
On branch cf/5886
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v5-0001-Fix-infinite-wait-when-reading-a-partially-writte.patch ===
Applying: Fix infinite wait when reading a partially written WAL record
Using index info to reconstruct a base tree...
M	src/backend/access/transam/xlogreader.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
=== using 'git am' to apply patch ./v5-0002-Improve-the-stability-of-the-recovery-test-047_ch.patch ===
Applying: Improve the stability of the recovery test 047_checkpoint_physical_slot
Using index info to reconstruct a base tree...
M	src/test/recovery/t/047_checkpoint_physical_slot.pl
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
=== using 'git am' to apply patch ./v5-0003-Reintroduce-test-046_checkpoint_logical_slot.patch ===
Applying: Reintroduce test 046_checkpoint_logical_slot
Using index info to reconstruct a base tree...
M	src/test/recovery/meson.build
Falling back to patching base and 3-way merge...
CONFLICT (add/add): Merge conflict in src/test/recovery/t/046_checkpoint_logical_slot.pl
Auto-merging src/test/recovery/t/046_checkpoint_logical_slot.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 Reintroduce test 046_checkpoint_logical_slot
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/046_checkpoint_logical_slot.pl
=== using patch(1) to apply patch ./v5-0003-Reintroduce-test-046_checkpoint_logical_slot.patch ===
patching file src/test/recovery/meson.build
Hunk #1 FAILED at 54.
1 out of 1 hunk FAILED -- saving rejects to file src/test/recovery/meson.build.rej
The next patch would create the file src/test/recovery/t/046_checkpoint_logical_slot.pl,
which already exists!  Skipping patch.
1 out of 1 hunk ignored
Removing src/test/recovery/meson.build.rej
=== using 'git apply' to apply patch ./v5-0003-Reintroduce-test-046_checkpoint_logical_slot.patch ===
Applied patch to 'src/test/recovery/meson.build' cleanly.
Performing three-way merge...
Applied patch to 'src/test/recovery/t/046_checkpoint_logical_slot.pl' with conflicts.
U src/test/recovery/t/046_checkpoint_logical_slot.pl
diff --cc src/test/recovery/t/046_checkpoint_logical_slot.pl
index 4fd709e3a03,bdfca3ddf82..00000000000
--- a/src/test/recovery/t/046_checkpoint_logical_slot.pl
+++ b/src/test/recovery/t/046_checkpoint_logical_slot.pl
@@@ -3,7 -3,7 +3,11 @@@
  # This test verifies the case when the logical slot is advanced during
  # checkpoint. The test checks that the logical slot's restart_lsn still refers
  # to an existed WAL segment after immediate restart.
++<<<<<<< ours
 +#
++=======
+ 
++>>>>>>> theirs
  use strict;
  use warnings FATAL => 'all';