=== Applying patches on top of PostgreSQL commit ID 80156cee06b9d257251d72379ac43f9b88bd13e1 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sat Apr 11 21:59:27 UTC 2026
On branch cf/6665
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v3-0001-Provide-astreamer_plain_reader-for-reading-files.patch ===
Applying: Provide astreamer_plain_reader for reading files.
=== using 'git am' to apply patch ./v3-0002-pg_waldump-Read-data-with-astreamer_plain_reader.patch ===
Applying: pg_waldump: Read data with astreamer_plain_reader.
Using index info to reconstruct a base tree...
M	src/bin/pg_waldump/archive_waldump.c
M	src/bin/pg_waldump/pg_waldump.h
Falling back to patching base and 3-way merge...
Auto-merging src/bin/pg_waldump/pg_waldump.h
CONFLICT (content): Merge conflict in src/bin/pg_waldump/pg_waldump.h
Auto-merging src/bin/pg_waldump/archive_waldump.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 pg_waldump: Read data with astreamer_plain_reader.
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 ./v3-0002-pg_waldump-Read-data-with-astreamer_plain_reader.patch ===
patching file src/bin/pg_waldump/archive_waldump.c
Hunk #5 succeeded at 511 (offset -2 lines).
Hunk #6 succeeded at 523 (offset -2 lines).
patching file src/bin/pg_waldump/pg_waldump.h
Hunk #1 FAILED at 34.
1 out of 1 hunk FAILED -- saving rejects to file src/bin/pg_waldump/pg_waldump.h.rej
Unstaged changes after reset:
M	src/bin/pg_waldump/archive_waldump.c
Removing src/bin/pg_waldump/pg_waldump.h.rej
=== using 'git apply' to apply patch ./v3-0002-pg_waldump-Read-data-with-astreamer_plain_reader.patch ===
Applied patch to 'src/bin/pg_waldump/archive_waldump.c' cleanly.
Applied patch to 'src/bin/pg_waldump/pg_waldump.h' with conflicts.
U src/bin/pg_waldump/pg_waldump.h
diff --cc src/bin/pg_waldump/pg_waldump.h
index beb61ec5892,d9f1b5d4726..00000000000
--- a/src/bin/pg_waldump/pg_waldump.h
+++ b/src/bin/pg_waldump/pg_waldump.h
@@@ -34,12 -34,9 +34,14 @@@ typedef struct XLogDumpPrivat
  	/* Fields required to read WAL from archive */
  	char	   *archive_dir;
  	char	   *archive_name;	/* Tar archive filename */
- 	int			archive_fd;		/* File descriptor for the open tar file */
- 	bool		archive_fd_eof; /* Have we reached EOF on archive_fd? */
  
  	astreamer  *archive_streamer;
++<<<<<<< ours
 +	char	   *archive_read_buf;	/* Reusable read buffer for archive I/O */
 +	size_t		archive_read_buf_size;
++=======
+ 	bool		archive_streamer_finalized;
++>>>>>>> theirs
  
  	/*
  	 * The buffer for the WAL file the archive streamer is currently reading,