=== Applying patches on top of PostgreSQL commit ID 72e6184cd5fe82620693a2aae9e34452d1984459 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Thu Aug 13 07:24:23 UTC 2026 On branch cf/6768 nothing to commit, working tree clean === using 'git am' to apply patch ./v7.0001-pg_rewind-use-UUIDs-to-detect-independent-same-TLI-p.patch === Applying: pg_rewind: use UUIDs to detect independent same-TLI promotions Using index info to reconstruct a base tree... M src/backend/access/transam/timeline.c M src/backend/access/transam/xlog.c M src/backend/utils/adt/uuid.c M src/bin/pg_rewind/pg_rewind.c M src/include/access/timeline.h M src/include/access/xlog_internal.h Falling back to patching base and 3-way merge... Auto-merging src/include/access/xlog_internal.h Auto-merging src/include/access/timeline.h CONFLICT (content): Merge conflict in src/include/access/timeline.h Auto-merging src/bin/pg_rewind/pg_rewind.c Auto-merging src/backend/utils/adt/uuid.c Auto-merging src/backend/access/transam/xlog.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 pg_rewind: use UUIDs to detect independent same-TLI promotions 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 ./v7.0001-pg_rewind-use-UUIDs-to-detect-independent-same-TLI-p.patch === patching file src/backend/access/transam/timeline.c Hunk #8 FAILED at 342. 1 out of 9 hunks FAILED -- saving rejects to file src/backend/access/transam/timeline.c.rej patching file src/backend/access/transam/xlog.c Hunk #2 succeeded at 6377 (offset -1 lines). Hunk #3 succeeded at 6410 (offset -1 lines). patching file src/backend/utils/adt/uuid.c Hunk #1 succeeded at 89 (offset 17 lines). Hunk #2 succeeded at 616 (offset 35 lines). Hunk #3 succeeded at 640 (offset 35 lines). patching file src/bin/pg_rewind/pg_rewind.c Hunk #4 succeeded at 391 (offset 2 lines). Hunk #5 succeeded at 419 (offset 2 lines). Hunk #6 succeeded at 892 (offset 2 lines). Hunk #7 succeeded at 981 (offset 2 lines). Hunk #8 succeeded at 1052 (offset 2 lines). patching file src/bin/pg_rewind/t/005_same_timeline.pl patching file src/bin/pg_rewind/timeline.c patching file src/include/access/timeline.h Hunk #3 FAILED at 35. 1 out of 3 hunks FAILED -- saving rejects to file src/include/access/timeline.h.rej patching file src/include/access/xlog_internal.h patching file src/include/utils/uuid.h Unstaged changes after reset: M src/backend/access/transam/timeline.c M src/backend/access/transam/xlog.c M src/backend/utils/adt/uuid.c M src/bin/pg_rewind/pg_rewind.c M src/bin/pg_rewind/t/005_same_timeline.pl M src/bin/pg_rewind/timeline.c M src/include/access/timeline.h M src/include/access/xlog_internal.h M src/include/utils/uuid.h Removing src/backend/access/transam/timeline.c.rej Removing src/include/access/timeline.h.rej === using 'git apply' to apply patch ./v7.0001-pg_rewind-use-UUIDs-to-detect-independent-same-TLI-p.patch === Applied patch to 'src/backend/access/transam/timeline.c' with conflicts. Applied patch to 'src/backend/access/transam/xlog.c' cleanly. Applied patch to 'src/backend/utils/adt/uuid.c' cleanly. Applied patch to 'src/bin/pg_rewind/pg_rewind.c' cleanly. Applied patch to 'src/bin/pg_rewind/t/005_same_timeline.pl' cleanly. Applied patch to 'src/bin/pg_rewind/timeline.c' cleanly. Applied patch to 'src/include/access/timeline.h' with conflicts. Applied patch to 'src/include/access/xlog_internal.h' cleanly. Applied patch to 'src/include/utils/uuid.h' cleanly. U src/backend/access/transam/timeline.c U src/include/access/timeline.h diff --cc src/backend/access/transam/timeline.c index d80c8ffe0a7,dee579c039b..00000000000 --- a/src/backend/access/transam/timeline.c +++ b/src/backend/access/transam/timeline.c @@@ -303,15 -361,17 +361,21 @@@ findNewestTimeLine(TimeLineID startTLI */ void writeTimeLineHistory(TimeLineID newTLI, TimeLineID parentTLI, ++<<<<<<< ours + XLogRecPtr switchpoint, const char *reason) ++======= + const pg_uuid_t *newTLUUID, + XLogRecPtr switchpoint, char *reason) ++>>>>>>> theirs { char path[MAXPGPATH]; char tmppath[MAXPGPATH]; char histfname[MAXFNAMELEN]; char buffer[BLCKSZ]; + char *uuid_str; int srcfd; int fd; - int nbytes; + ssize_t nbytes; Assert(newTLI > parentTLI); /* else bad selection of newTLI */ diff --cc src/include/access/timeline.h index 3aee3419a5c,cdd642c94f0..00000000000 --- a/src/include/access/timeline.h +++ b/src/include/access/timeline.h @@@ -33,8 -35,9 +35,14 @@@ extern List *readTimeLineHistory(TimeLi extern bool existsTimeLineHistory(TimeLineID probeTLI); extern TimeLineID findNewestTimeLine(TimeLineID startTLI); extern void writeTimeLineHistory(TimeLineID newTLI, TimeLineID parentTLI, ++<<<<<<< ours + XLogRecPtr switchpoint, const char *reason); +extern void writeTimeLineHistoryFile(TimeLineID tli, const char *content, size_t size); ++======= + const pg_uuid_t *newTLUUID, + XLogRecPtr switchpoint, char *reason); + extern void writeTimeLineHistoryFile(TimeLineID tli, 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);