=== Applying patches on top of PostgreSQL commit ID b59783502224c0ae721974a5d9b6fb915cbd37e1 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sat Aug  8 03:02:25 UTC 2026
On branch cf/7070
nothing to commit, working tree clean
=== using 'git am' to apply patch ./0001-Don-t-skip-invalid-databases-when-enabling-data-chec.patch ===
Applying: Don't skip invalid databases when enabling data checksums
Using index info to reconstruct a base tree...
M	src/backend/commands/dbcommands.c
M	src/backend/postmaster/datachecksum_state.c
M	src/test/modules/test_checksums/t/005_injection.pl
Falling back to patching base and 3-way merge...
Auto-merging src/test/modules/test_checksums/t/005_injection.pl
CONFLICT (content): Merge conflict in src/test/modules/test_checksums/t/005_injection.pl
Auto-merging src/backend/postmaster/datachecksum_state.c
CONFLICT (content): Merge conflict in src/backend/postmaster/datachecksum_state.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 Don't skip invalid databases when enabling data checksums
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-Don-t-skip-invalid-databases-when-enabling-data-chec.patch ===
patching file src/backend/commands/dbcommands.c
Hunk #1 succeeded at 1885 with fuzz 2 (offset 2 lines).
patching file src/backend/postmaster/datachecksum_state.c
Hunk #1 FAILED at 587.
Hunk #2 FAILED at 996.
Hunk #3 FAILED at 1415.
Hunk #4 FAILED at 1427.
Hunk #5 FAILED at 1450.
5 out of 5 hunks FAILED -- saving rejects to file src/backend/postmaster/datachecksum_state.c.rej
patching file src/test/modules/test_checksums/t/005_injection.pl
Hunk #1 succeeded at 79 with fuzz 2.
Unstaged changes after reset:
M	src/backend/commands/dbcommands.c
M	src/test/modules/test_checksums/t/005_injection.pl
Removing src/backend/postmaster/datachecksum_state.c.rej
=== using 'git apply' to apply patch ./0001-Don-t-skip-invalid-databases-when-enabling-data-chec.patch ===
Applied patch to 'src/backend/commands/dbcommands.c' cleanly.
Applied patch to 'src/backend/postmaster/datachecksum_state.c' with conflicts.
Applied patch to 'src/test/modules/test_checksums/t/005_injection.pl' with conflicts.
U src/backend/postmaster/datachecksum_state.c
U src/test/modules/test_checksums/t/005_injection.pl
diff --cc src/backend/postmaster/datachecksum_state.c
index be308a282d5,d525dccce5e..00000000000
--- a/src/backend/postmaster/datachecksum_state.c
+++ b/src/backend/postmaster/datachecksum_state.c
@@@ -587,8 -587,8 +587,13 @@@ enable_data_checksums(PG_FUNCTION_ARGS
  	/*
  	 * An invalid database cannot be connected to, so the worker would fail to
  	 * process it, and unlike a dropped database its files stay around.  Error
++<<<<<<< ours
 +	 * out early with a hint rather than failing halfway through processing. A
 +	 * database which turns invalid after this check, for example from an
++=======
+ 	 * out early with a hint rather than failing halfway through processing.
+ 	 * A database which turns invalid after this check, for example from an
++>>>>>>> theirs
  	 * interrupted DROP DATABASE, instead makes its worker fail; the launcher
  	 * then aborts and leaves checksums disabled, since the invalid database's
  	 * files would otherwise be left without valid checksums.
diff --cc src/test/modules/test_checksums/t/005_injection.pl
index 60bb716d922,6c49f640e8b..00000000000
--- a/src/test/modules/test_checksums/t/005_injection.pl
+++ b/src/test/modules/test_checksums/t/005_injection.pl
@@@ -113,7 -113,8 +113,12 @@@ unlike
  # Leave the database durably marked invalid, but abort DROP DATABASE before
  # its catalog row and files are removed.
  $node->safe_psql('postgres',
++<<<<<<< ours
 +	"SELECT injection_points_attach('dropdb-after-invalid-marker','error');");
++=======
+ 	"SELECT injection_points_attach('dropdb-after-invalid-marker','error');"
+ );
++>>>>>>> theirs
  my ($drop_ret, $drop_stdout, $drop_stderr) =
    $node->psql('postgres', 'DROP DATABASE invalid_dropdb;');
  isnt($drop_ret, 0, 'DROP DATABASE was interrupted after invalidation');