=== Applying patches on top of PostgreSQL commit ID 1f414035135cca34b606d4c0d3db0eb57045e00b ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Fri Jul 17 14:46:26 UTC 2026
On branch cf/7026
nothing to commit, working tree clean
=== using 'git am' to apply patch ./0001-Shut-down-instead-of-promoting-when-recovery-cannot-.patch ===
Applying: Shut down instead of promoting when recovery cannot pause
Using index info to reconstruct a base tree...
M	doc/src/sgml/config.sgml
M	src/backend/access/transam/xlogrecovery.c
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/backend/access/transam/xlogrecovery.c
Auto-merging doc/src/sgml/config.sgml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Shut down instead of promoting when recovery cannot pause
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-Shut-down-instead-of-promoting-when-recovery-cannot-.patch ===
patching file doc/src/sgml/config.sgml
Hunk #1 succeeded at 4649 (offset 2 lines).
patching file src/backend/access/transam/xlogrecovery.c
patching file src/test/recovery/meson.build
Hunk #1 FAILED at 62.
1 out of 1 hunk FAILED -- saving rejects to file src/test/recovery/meson.build.rej
patching file src/test/recovery/t/054_recovery_pause_subxid.pl
Unstaged changes after reset:
M	doc/src/sgml/config.sgml
M	src/backend/access/transam/xlogrecovery.c
Removing src/test/recovery/meson.build.rej
Removing src/test/recovery/t/054_recovery_pause_subxid.pl
=== using 'git apply' to apply patch ./0001-Shut-down-instead-of-promoting-when-recovery-cannot-.patch ===
Applied patch to 'doc/src/sgml/config.sgml' cleanly.
Applied patch to 'src/backend/access/transam/xlogrecovery.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 ad0d85f4189,7dcf1ddbe13..00000000000
--- a/src/test/recovery/meson.build
+++ b/src/test/recovery/meson.build
@@@ -62,7 -62,7 +62,11 @@@ tests += 
        't/051_effective_wal_level.pl',
        't/052_checkpoint_segment_missing.pl',
        't/053_standby_login_event_trigger.pl',
++<<<<<<< ours
 +      't/054_unlogged_sequence_promotion.pl',
++=======
+       't/054_recovery_pause_subxid.pl',
++>>>>>>> theirs
      ],
    },
  }