=== Applying patches on top of PostgreSQL commit ID 4c1a27e53a508f74883cda52a6c8612121d7fd6b === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Wed Feb 25 22:42:28 UTC 2026 On branch cf/4677 nothing to commit, working tree clean === using 'git am' to apply patch ./v28-0001-Integrate-addition-of-attributes-for-sequences-w.patch === Applying: Integrate addition of attributes for sequences with ALTER TABLE === using 'git am' to apply patch ./v28-0002-Refactor-code-for-in-core-local-sequences.patch === Applying: Refactor code for in-core "local" sequences === using 'git am' to apply patch ./v28-0003-Sequence-access-methods-backend-support.patch === Applying: Sequence access methods - backend support === using 'git am' to apply patch ./v28-0004-Sequence-access-methods-dump-restore-support.patch === Applying: Sequence access methods - dump/restore support Using index info to reconstruct a base tree... M doc/src/sgml/ref/pg_dump.sgml M doc/src/sgml/ref/pg_restore.sgml M src/bin/pg_dump/pg_backup.h M src/bin/pg_dump/pg_backup_archiver.c M src/bin/pg_dump/pg_dump.c M src/bin/pg_dump/pg_dumpall.c M src/bin/pg_dump/t/002_pg_dump.pl Falling back to patching base and 3-way merge... Auto-merging src/bin/pg_dump/t/002_pg_dump.pl Auto-merging src/bin/pg_dump/pg_dumpall.c Auto-merging src/bin/pg_dump/pg_dump.c CONFLICT (content): Merge conflict in src/bin/pg_dump/pg_dump.c Auto-merging src/bin/pg_dump/pg_backup_archiver.c Auto-merging src/bin/pg_dump/pg_backup.h Auto-merging doc/src/sgml/ref/pg_restore.sgml Auto-merging doc/src/sgml/ref/pg_dump.sgml error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 Sequence access methods - dump/restore support 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". Unstaged changes after reset: M doc/src/sgml/ref/pg_dump.sgml M doc/src/sgml/ref/pg_dumpall.sgml M doc/src/sgml/ref/pg_restore.sgml M src/bin/pg_dump/pg_backup.h M src/bin/pg_dump/pg_backup_archiver.c M src/bin/pg_dump/pg_backup_archiver.h M src/bin/pg_dump/pg_dump.c M src/bin/pg_dump/pg_dumpall.c M src/bin/pg_dump/pg_restore.c M src/bin/pg_dump/t/002_pg_dump.pl === using patch(1) to apply patch ./v28-0004-Sequence-access-methods-dump-restore-support.patch === patching file src/bin/pg_dump/pg_backup.h Hunk #1 succeeded at 98 (offset 1 line). Hunk #2 succeeded at 194 (offset 1 line). patching file src/bin/pg_dump/pg_backup_archiver.c Hunk #6 succeeded at 3538 (offset -4 lines). Hunk #7 succeeded at 3703 (offset -4 lines). Hunk #8 succeeded at 3963 (offset -4 lines). Hunk #9 succeeded at 4483 (offset -4 lines). Hunk #10 succeeded at 5224 (offset -4 lines). Hunk #11 succeeded at 5284 (offset -4 lines). patching file src/bin/pg_dump/pg_backup_archiver.h patching file src/bin/pg_dump/pg_dump.c Hunk #1 FAILED at 137. Hunk #2 succeeded at 501 (offset -3 lines). Hunk #3 succeeded at 1250 (offset -14 lines). Hunk #4 succeeded at 1373 (offset -14 lines). Hunk #5 succeeded at 14458 (offset 18 lines). Hunk #6 succeeded at 19172 (offset 246 lines). Hunk #7 FAILED at 18979. Hunk #8 succeeded at 19297 (offset 247 lines). Hunk #9 succeeded at 19420 (offset 247 lines). 2 out of 9 hunks FAILED -- saving rejects to file src/bin/pg_dump/pg_dump.c.rej patching file src/bin/pg_dump/pg_dumpall.c Hunk #3 succeeded at 457 (offset -1 lines). patching file src/bin/pg_dump/pg_restore.c patching file src/bin/pg_dump/t/002_pg_dump.pl Hunk #3 succeeded at 4675 (offset -5 lines). Hunk #4 succeeded at 4715 (offset -5 lines). patching file doc/src/sgml/ref/pg_dump.sgml Hunk #1 succeeded at 1152 (offset -22 lines). patching file doc/src/sgml/ref/pg_dumpall.sgml patching file doc/src/sgml/ref/pg_restore.sgml Hunk #1 succeeded at 776 (offset -10 lines). Unstaged changes after reset: M doc/src/sgml/ref/pg_dump.sgml M doc/src/sgml/ref/pg_dumpall.sgml M doc/src/sgml/ref/pg_restore.sgml M src/bin/pg_dump/pg_backup.h M src/bin/pg_dump/pg_backup_archiver.c M src/bin/pg_dump/pg_backup_archiver.h M src/bin/pg_dump/pg_dump.c M src/bin/pg_dump/pg_dumpall.c M src/bin/pg_dump/pg_restore.c M src/bin/pg_dump/t/002_pg_dump.pl Removing src/bin/pg_dump/pg_dump.c.rej === using 'git apply' to apply patch ./v28-0004-Sequence-access-methods-dump-restore-support.patch === Applied patch to 'src/bin/pg_dump/pg_backup.h' cleanly. Applied patch to 'src/bin/pg_dump/pg_backup_archiver.c' cleanly. Applied patch to 'src/bin/pg_dump/pg_backup_archiver.h' cleanly. Applied patch to 'src/bin/pg_dump/pg_dump.c' with conflicts. Applied patch to 'src/bin/pg_dump/pg_dumpall.c' cleanly. Applied patch to 'src/bin/pg_dump/pg_restore.c' cleanly. Applied patch to 'src/bin/pg_dump/t/002_pg_dump.pl' cleanly. Applied patch to 'doc/src/sgml/ref/pg_dump.sgml' cleanly. Applied patch to 'doc/src/sgml/ref/pg_dumpall.sgml' cleanly. Applied patch to 'doc/src/sgml/ref/pg_restore.sgml' cleanly. U src/bin/pg_dump/pg_dump.c diff --cc src/bin/pg_dump/pg_dump.c index 450cec285b3,6202b0d1666..00000000000 --- a/src/bin/pg_dump/pg_dump.c +++ b/src/bin/pg_dump/pg_dump.c @@@ -138,7 -137,7 +138,11 @@@ typedef struc int64 cache; /* cache size */ int64 last_value; /* last value of sequence */ bool is_called; /* whether nextval advances before returning */ ++<<<<<<< ours + bool null_seqtuple; /* did pg_get_sequence_data return nulls? */ ++======= + char *seqam; /* access method of sequence */ ++>>>>>>> theirs } SequenceItem; typedef enum OidOptions @@@ -19205,7 -18980,10 +19229,14 @@@ collectSequences(Archive *fout sequences[i].cycled = (strcmp(PQgetvalue(res, i, 7), "t") == 0); sequences[i].last_value = strtoi64(PQgetvalue(res, i, 8), NULL, 10); sequences[i].is_called = (strcmp(PQgetvalue(res, i, 9), "t") == 0); ++<<<<<<< ours + sequences[i].null_seqtuple = (PQgetisnull(res, i, 8) || PQgetisnull(res, i, 9)); ++======= + if (!PQgetisnull(res, i, 10)) + sequences[i].seqam = pg_strdup(PQgetvalue(res, i, 10)); + else + sequences[i].seqam = NULL; ++>>>>>>> theirs } PQclear(res);