=== Applying patches on top of PostgreSQL commit ID a625e153b7d2f0e1c81955d13f2fc8de472bc082 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Wed Nov  4 10:26:34 UTC 2026
On branch cf/7257
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v2-0001-Fix-UAF-after-failed-pg_checksum_init.patch ===
Applying: Fix checksum error handling in pg_combinebackup
Using index info to reconstruct a base tree...
M	src/bin/pg_combinebackup/meson.build
M	src/bin/pg_combinebackup/pg_combinebackup.c
M	src/bin/pg_combinebackup/reconstruct.c
Falling back to patching base and 3-way merge...
Auto-merging src/bin/pg_combinebackup/reconstruct.c
Auto-merging src/bin/pg_combinebackup/pg_combinebackup.c
Auto-merging src/bin/pg_combinebackup/meson.build
CONFLICT (content): Merge conflict in src/bin/pg_combinebackup/meson.build
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 error handling in pg_combinebackup
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 ./v2-0001-Fix-UAF-after-failed-pg_checksum_init.patch ===
patching file src/bin/pg_combinebackup/Makefile
patching file src/bin/pg_combinebackup/backup_label.c
patching file src/bin/pg_combinebackup/meson.build
Hunk #2 FAILED at 53.
1 out of 2 hunks FAILED -- saving rejects to file src/bin/pg_combinebackup/meson.build.rej
patching file src/bin/pg_combinebackup/pg_combinebackup.c
Hunk #1 succeeded at 1073 (offset 6 lines).
Hunk #2 succeeded at 1118 (offset 6 lines).
Hunk #3 succeeded at 1136 (offset 6 lines).
patching file src/bin/pg_combinebackup/reconstruct.c
patching file src/bin/pg_combinebackup/t/013_checksum_helper.pl
patching file src/bin/pg_combinebackup/test_checksum_helper.c
patching file src/bin/pg_combinebackup/write_manifest.c
patching file src/common/checksum_helper.c
Unstaged changes after reset:
M	src/bin/pg_combinebackup/Makefile
M	src/bin/pg_combinebackup/backup_label.c
M	src/bin/pg_combinebackup/meson.build
M	src/bin/pg_combinebackup/pg_combinebackup.c
M	src/bin/pg_combinebackup/reconstruct.c
M	src/bin/pg_combinebackup/write_manifest.c
M	src/common/checksum_helper.c
Removing src/bin/pg_combinebackup/meson.build.rej
Removing src/bin/pg_combinebackup/t/013_checksum_helper.pl
Removing src/bin/pg_combinebackup/test_checksum_helper.c
=== using 'git apply' to apply patch ./v2-0001-Fix-UAF-after-failed-pg_checksum_init.patch ===
Applied patch to 'src/bin/pg_combinebackup/Makefile' cleanly.
Applied patch to 'src/bin/pg_combinebackup/backup_label.c' cleanly.
Applied patch to 'src/bin/pg_combinebackup/meson.build' with conflicts.
Applied patch to 'src/bin/pg_combinebackup/pg_combinebackup.c' cleanly.
Applied patch to 'src/bin/pg_combinebackup/reconstruct.c' cleanly.
Falling back to direct application...
Falling back to direct application...
Applied patch to 'src/bin/pg_combinebackup/write_manifest.c' cleanly.
Applied patch to 'src/common/checksum_helper.c' cleanly.
U src/bin/pg_combinebackup/meson.build
diff --cc src/bin/pg_combinebackup/meson.build
index 10702f36a5d,f3069b3c709..00000000000
--- a/src/bin/pg_combinebackup/meson.build
+++ b/src/bin/pg_combinebackup/meson.build
@@@ -40,8 -53,9 +53,13 @@@ tests += 
        't/010_hardlink.pl',
        't/011_ib_truncation.pl',
        't/012_vm_consistency.pl',
++<<<<<<< ours
 +      't/013_summary_order.pl',
++=======
+       't/013_checksum_helper.pl',
++>>>>>>> theirs
      ],
+     'deps': [test_checksum_helper],
    }
  }