=== Applying patches on top of PostgreSQL commit ID eed6c0d33e09c53e5861fa92e99318814c5862f7 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sat Jul 11 08:38:33 UTC 2026
On branch cf/6959
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v1-0001-Some-const-qualifications-added-in-passing.patch ===
Applying: Some const qualifications added in passing
=== using 'git am' to apply patch ./v1-0002-Don-t-cast-pgoff_t-to-possibly-32-bit-types-for-o.patch ===
Applying: Don't cast pgoff_t to possibly 32-bit types for output
Using index info to reconstruct a base tree...
M	src/backend/backup/basebackup_server.c
M	src/backend/backup/walsummary.c
M	src/backend/replication/walsender.c
M	src/backend/storage/file/fd.c
Falling back to patching base and 3-way merge...
Auto-merging src/backend/replication/walsender.c
CONFLICT (content): Merge conflict in src/backend/replication/walsender.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 cast pgoff_t to possibly 32-bit types for output
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-0002-Don-t-cast-pgoff_t-to-possibly-32-bit-types-for-o.patch ===
patching file src/backend/backup/basebackup_server.c
Hunk #1 FAILED at 176.
Hunk #2 FAILED at 269.
2 out of 2 hunks FAILED -- saving rejects to file src/backend/backup/basebackup_server.c.rej
patching file src/backend/backup/walsummary.c
Hunk #1 FAILED at 306.
1 out of 1 hunk FAILED -- saving rejects to file src/backend/backup/walsummary.c.rej
patching file src/backend/replication/walsender.c
Hunk #1 succeeded at 667 with fuzz 2 (offset 6 lines).
patching file src/backend/storage/file/fd.c
Hunk #1 FAILED at 1521.
1 out of 1 hunk FAILED -- saving rejects to file src/backend/storage/file/fd.c.rej
Unstaged changes after reset:
M	src/backend/replication/walsender.c
Removing src/backend/backup/basebackup_server.c.rej
Removing src/backend/backup/walsummary.c.rej
Removing src/backend/storage/file/fd.c.rej
=== using 'git apply' to apply patch ./v1-0002-Don-t-cast-pgoff_t-to-possibly-32-bit-types-for-o.patch ===
Applied patch to 'src/backend/backup/basebackup_server.c' cleanly.
Applied patch to 'src/backend/backup/walsummary.c' cleanly.
Applied patch to 'src/backend/replication/walsender.c' with conflicts.
Applied patch to 'src/backend/storage/file/fd.c' cleanly.
U src/backend/replication/walsender.c
diff --cc src/backend/replication/walsender.c
index ae9ffd0d096,de8c9940877..00000000000
--- a/src/backend/replication/walsender.c
+++ b/src/backend/replication/walsender.c
@@@ -661,12 -661,8 +661,17 @@@ SendTimeLineHistory(TimeLineHistoryCmd 
  				(errcode_for_file_access(),
  				 errmsg("could not seek to beginning of file \"%s\": %m", path)));
  
++<<<<<<< ours
 +	/*
 +	 * unlikely in practice, but to document the implicit integer conversion
 +	 */
 +	if (histfilelen > UINT32_MAX)
 +		elog(ERROR, "timeline history file is too large");
 +
++=======
+ 	/* XXX might truncate histfilelen */
+ 	Assert(histfilelen <= UINT32_MAX);
++>>>>>>> theirs
  	pq_sendint32(&buf, histfilelen);	/* col2 len */
  
  	bytesleft = histfilelen;