=== Applying patches on top of PostgreSQL commit ID 5174d157a0381876cb1c6c5903c1844669d5bbc2 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Thu Jul 16 00:58:30 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 index info to reconstruct a base tree... M src/backend/access/transam/timeline.c M src/backend/access/transam/twophase.c M src/bin/pg_basebackup/receivelog.c M src/bin/pg_combinebackup/reconstruct.c M src/include/access/timeline.h Falling back to patching base and 3-way merge... Auto-merging src/include/access/timeline.h CONFLICT (content): Merge conflict in src/include/access/timeline.h Auto-merging src/bin/pg_combinebackup/reconstruct.c CONFLICT (content): Merge conflict in src/bin/pg_combinebackup/reconstruct.c Auto-merging src/bin/pg_basebackup/receivelog.c Auto-merging src/backend/access/transam/twophase.c CONFLICT (content): Merge conflict in src/backend/access/transam/twophase.c Auto-merging src/backend/access/transam/timeline.c CONFLICT (content): Merge conflict in src/backend/access/transam/timeline.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 Some const qualifications added in passing 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-Some-const-qualifications-added-in-passing.patch === patching file src/backend/access/transam/timeline.c Hunk #1 FAILED at 303. Hunk #2 FAILED at 461. 2 out of 2 hunks FAILED -- saving rejects to file src/backend/access/transam/timeline.c.rej patching file src/backend/access/transam/twophase.c Hunk #1 FAILED at 240. Hunk #2 FAILED at 1745. 2 out of 2 hunks FAILED -- saving rejects to file src/backend/access/transam/twophase.c.rej patching file src/bin/pg_basebackup/receivelog.c Hunk #1 FAILED at 272. 1 out of 1 hunk FAILED -- saving rejects to file src/bin/pg_basebackup/receivelog.c.rej patching file src/bin/pg_combinebackup/reconstruct.c Hunk #1 FAILED at 49. Hunk #2 FAILED at 436. Hunk #3 FAILED at 453. Hunk #4 FAILED at 508. Hunk #5 FAILED at 532. Hunk #6 FAILED at 550. Hunk #7 FAILED at 750. Hunk #8 FAILED at 774. 8 out of 8 hunks FAILED -- saving rejects to file src/bin/pg_combinebackup/reconstruct.c.rej patching file src/include/access/timeline.h Hunk #1 FAILED at 33. 1 out of 1 hunk FAILED -- saving rejects to file src/include/access/timeline.h.rej Removing src/backend/access/transam/timeline.c.rej Removing src/backend/access/transam/twophase.c.rej Removing src/bin/pg_basebackup/receivelog.c.rej Removing src/bin/pg_combinebackup/reconstruct.c.rej Removing src/include/access/timeline.h.rej === using 'git apply' to apply patch ./v1-0001-Some-const-qualifications-added-in-passing.patch === Applied patch to 'src/backend/access/transam/timeline.c' with conflicts. Applied patch to 'src/backend/access/transam/twophase.c' with conflicts. Applied patch to 'src/bin/pg_basebackup/receivelog.c' cleanly. Applied patch to 'src/bin/pg_combinebackup/reconstruct.c' with conflicts. Applied patch to 'src/include/access/timeline.h' with conflicts. U src/backend/access/transam/timeline.c U src/backend/access/transam/twophase.c U src/bin/pg_combinebackup/reconstruct.c U src/include/access/timeline.h diff --cc src/backend/access/transam/timeline.c index d80c8ffe0a7,d49e52993b7..00000000000 --- a/src/backend/access/transam/timeline.c +++ b/src/backend/access/transam/timeline.c @@@ -461,7 -461,7 +461,11 @@@ writeTimeLineHistory(TimeLineID newTLI * to avoid emplacing a bogus file. */ void ++<<<<<<< ours +writeTimeLineHistoryFile(TimeLineID tli, const char *content, size_t size) ++======= + writeTimeLineHistoryFile(TimeLineID tli, const char *content, int size) ++>>>>>>> theirs { char path[MAXPGPATH]; char tmppath[MAXPGPATH]; diff --cc src/backend/access/transam/twophase.c index 439e28c9987,e27efcaab47..00000000000 --- a/src/backend/access/transam/twophase.c +++ b/src/backend/access/transam/twophase.c @@@ -240,7 -240,7 +240,11 @@@ static void MarkAsPreparingGuts(GlobalT const char *gid, TimestampTz prepared_at, Oid owner, Oid databaseid); static void RemoveTwoPhaseFile(FullTransactionId fxid, bool giveWarning); ++<<<<<<< ours +static void RecreateTwoPhaseFile(FullTransactionId fxid, const void *content, size_t len); ++======= + static void RecreateTwoPhaseFile(FullTransactionId fxid, const void *content, int len); ++>>>>>>> theirs /* * Register shared memory for two-phase state. @@@ -1747,7 -1745,7 +1751,11 @@@ RemoveTwoPhaseFile(FullTransactionId fx * Note: content and len don't include CRC. */ static void ++<<<<<<< ours +RecreateTwoPhaseFile(FullTransactionId fxid, const void *content, size_t len) ++======= + RecreateTwoPhaseFile(FullTransactionId fxid, const void *content, int len) ++>>>>>>> theirs { char path[MAXPGPATH]; pg_crc32c statefile_crc; diff --cc src/bin/pg_combinebackup/reconstruct.c index e4b02746127,0541e6dacab..00000000000 --- a/src/bin/pg_combinebackup/reconstruct.c +++ b/src/bin/pg_combinebackup/reconstruct.c @@@ -61,7 -61,7 +61,11 @@@ static void write_reconstructed_file(co CopyMethod copy_method, bool debug, bool dry_run); ++<<<<<<< ours +static void read_bytes(const rfile *rf, void *buffer, size_t length); ++======= + static void read_bytes(const rfile *rf, void *buffer, unsigned length); ++>>>>>>> theirs static void write_block(int fd, const char *output_filename, const uint8 *buffer, pg_checksum_context *checksum_ctx); @@@ -529,11 -532,9 +533,15 @@@ make_rfile(const char *filename, bool m * Read the indicated number of bytes from an rfile into the buffer. */ static void ++<<<<<<< ours +read_bytes(const rfile *rf, void *buffer, size_t length) ++======= + read_bytes(const rfile *rf, void *buffer, unsigned length) ++>>>>>>> theirs { - int rb = read(rf->fd, buffer, length); + ssize_t rb; + + rb = read(rf->fd, buffer, length); if (rb != length) { diff --cc src/include/access/timeline.h index 3aee3419a5c,76b852d07ab..00000000000 --- a/src/include/access/timeline.h +++ b/src/include/access/timeline.h @@@ -34,7 -34,7 +34,11 @@@ extern bool existsTimeLineHistory(TimeL extern TimeLineID findNewestTimeLine(TimeLineID startTLI); extern void writeTimeLineHistory(TimeLineID newTLI, TimeLineID parentTLI, XLogRecPtr switchpoint, const char *reason); ++<<<<<<< ours +extern void writeTimeLineHistoryFile(TimeLineID tli, const char *content, size_t size); ++======= + extern void writeTimeLineHistoryFile(TimeLineID tli, const char *content, int size); ++>>>>>>> theirs extern void restoreTimeLineHistoryFiles(TimeLineID begin, TimeLineID end); extern bool tliInHistory(TimeLineID tli, List *expectedTLEs); extern TimeLineID tliOfPointInHistory(XLogRecPtr ptr, List *history);