=== Applying patches on top of PostgreSQL commit ID 144ad723a4484927266a316d1c9550d56745ff67 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Sat Jul 5 08:47:22 UTC 2025 On branch cf/4337 nothing to commit, working tree clean === using 'git am' to apply patch ./v34-0001-Add-a-syntax-to-create-Incrementally-Maintainabl.patch === Applying: Add a syntax to create Incrementally Maintainable Materialized Views Using index info to reconstruct a base tree... M src/backend/parser/gram.y M src/include/nodes/primnodes.h M src/include/parser/kwlist.h Falling back to patching base and 3-way merge... Auto-merging src/include/parser/kwlist.h Auto-merging src/include/nodes/primnodes.h Auto-merging src/backend/parser/gram.y === using 'git am' to apply patch ./v34-0002-Add-relisivm-column-to-pg_class-system-catalog.patch === Applying: Add relisivm column to pg_class system catalog === using 'git am' to apply patch ./v34-0003-Allow-to-prolong-life-span-of-transition-tables-.patch === Applying: Allow to prolong life span of transition tables until transaction end === using 'git am' to apply patch ./v34-0004-Add-Incremental-View-Maintenance-support-to-pg_d.patch === Applying: Add Incremental View Maintenance support to pg_dump Using index info to reconstruct a base tree... M src/bin/pg_dump/pg_dump.c M src/bin/pg_dump/pg_dump.h 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_dump.h Auto-merging src/bin/pg_dump/pg_dump.c CONFLICT (content): Merge conflict in src/bin/pg_dump/pg_dump.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 Add Incremental View Maintenance support to pg_dump 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 src/bin/pg_dump/pg_dump.c M src/bin/pg_dump/pg_dump.h M src/bin/pg_dump/t/002_pg_dump.pl === using patch(1) to apply patch ./v34-0004-Add-Incremental-View-Maintenance-support-to-pg_d.patch === patching file src/bin/pg_dump/pg_dump.c Hunk #1 succeeded at 7005 (offset 283 lines). Hunk #2 succeeded at 7115 (offset 290 lines). Hunk #3 succeeded at 7237 (offset 293 lines). Hunk #4 succeeded at 7320 (offset 296 lines). Hunk #5 FAILED at 15822. 1 out of 5 hunks FAILED -- saving rejects to file src/bin/pg_dump/pg_dump.c.rej patching file src/bin/pg_dump/pg_dump.h Hunk #1 succeeded at 340 (offset 15 lines). patching file src/bin/pg_dump/t/002_pg_dump.pl Hunk #1 succeeded at 3121 (offset 336 lines). Unstaged changes after reset: M src/bin/pg_dump/pg_dump.c M src/bin/pg_dump/pg_dump.h 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 ./v34-0004-Add-Incremental-View-Maintenance-support-to-pg_d.patch === Applied patch to 'src/bin/pg_dump/pg_dump.c' with conflicts. Applied patch to 'src/bin/pg_dump/pg_dump.h' cleanly. Applied patch to 'src/bin/pg_dump/t/002_pg_dump.pl' cleanly. U src/bin/pg_dump/pg_dump.c diff --cc src/bin/pg_dump/pg_dump.c index 1937997ea67,dedb91c5f00..00000000000 --- a/src/bin/pg_dump/pg_dump.c +++ b/src/bin/pg_dump/pg_dump.c @@@ -16922,14 -15822,11 +16932,21 @@@ dumpTableSchema(Archive *fout, const Ta binary_upgrade_set_pg_class_oids(fout, q, tbinfo->dobj.catId.oid); ++<<<<<<< ours + /* + * PostgreSQL 18 has disabled UNLOGGED for partitioned tables, so + * ignore it when dumping if it was set in this case. + */ + appendPQExpBuffer(q, "CREATE %s%s %s", + (tbinfo->relpersistence == RELPERSISTENCE_UNLOGGED && + tbinfo->relkind != RELKIND_PARTITIONED_TABLE) ? ++======= + appendPQExpBuffer(q, "CREATE %s%s%s %s", + tbinfo->relpersistence == RELPERSISTENCE_UNLOGGED ? ++>>>>>>> theirs "UNLOGGED " : "", + tbinfo->relkind == RELKIND_MATVIEW && tbinfo->isivm ? + "INCREMENTAL " : "", reltypename, qualrelname);