=== Applying patches on top of PostgreSQL commit ID 77705d1e5a616339c3e92f586bbfa7b6bb562beb ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sun Nov  1 07:07:27 UTC 2026
On branch cf/7573
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v1-0001-Fix-pg_combinebackup-with-truncated-intermediate-.patch ===
Applying: Fix pg_combinebackup with truncated intermediate backups.
Using index info to reconstruct a base tree...
M	src/bin/pg_combinebackup/reconstruct.c
Falling back to patching base and 3-way merge...
Auto-merging src/bin/pg_combinebackup/reconstruct.c
CONFLICT (content): Merge conflict in src/bin/pg_combinebackup/reconstruct.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 pg_combinebackup with truncated intermediate backups.
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 ./v1-0001-Fix-pg_combinebackup-with-truncated-intermediate-.patch ===
patching file src/bin/pg_combinebackup/reconstruct.c
Hunk #1 FAILED at 105.
Hunk #2 succeeded at 128 (offset -1 lines).
Hunk #3 succeeded at 225 (offset -1 lines).
Hunk #4 succeeded at 265 (offset -1 lines).
Hunk #5 succeeded at 279 (offset -1 lines).
1 out of 5 hunks FAILED -- saving rejects to file src/bin/pg_combinebackup/reconstruct.c.rej
patching file src/bin/pg_combinebackup/t/011_ib_truncation.pl
Unstaged changes after reset:
M	src/bin/pg_combinebackup/reconstruct.c
M	src/bin/pg_combinebackup/t/011_ib_truncation.pl
Removing src/bin/pg_combinebackup/reconstruct.c.rej
=== using 'git apply' to apply patch ./v1-0001-Fix-pg_combinebackup-with-truncated-intermediate-.patch ===
Applied patch to 'src/bin/pg_combinebackup/reconstruct.c' with conflicts.
Applied patch to 'src/bin/pg_combinebackup/t/011_ib_truncation.pl' cleanly.
U src/bin/pg_combinebackup/reconstruct.c
diff --cc src/bin/pg_combinebackup/reconstruct.c
index 5900c5b0835,eb98455c170..00000000000
--- a/src/bin/pg_combinebackup/reconstruct.c
+++ b/src/bin/pg_combinebackup/reconstruct.c
@@@ -105,6 -105,8 +105,11 @@@ reconstruct_from_incremental_file(char 
  	rfile	  **sourcemap;
  	off_t	   *offsetmap;
  	unsigned	block_length;
++<<<<<<< ours
++=======
+ 	unsigned	truncation_block_length;
+ 	unsigned	i;
++>>>>>>> theirs
  	unsigned	sidx = n_prior_backups;
  	bool		full_copy_possible = true;
  	int			copy_source_index = -1;