=== Applying patches on top of PostgreSQL commit ID 70a13c528b6e382a381ff95c15a4989e2dd9360b === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Fri May 23 08:40:22 UTC 2025 On branch cf/4529 nothing to commit, working tree clean === using 'git am' to apply patch ./v14-0001-CREATE-SUSBCRIPTION-.-SERVER.patch === Applying: CREATE SUSBCRIPTION ... SERVER. Using index info to reconstruct a base tree... M contrib/postgres_fdw/connection.c M contrib/postgres_fdw/expected/postgres_fdw.out M contrib/postgres_fdw/postgres_fdw--1.1--1.2.sql M contrib/postgres_fdw/sql/postgres_fdw.sql M src/backend/foreign/foreign.c M src/backend/parser/gram.y M src/backend/replication/logical/worker.c M src/bin/pg_dump/pg_dump.c M src/bin/pg_dump/pg_dump.h M src/bin/psql/tab-complete.in.c M src/include/nodes/parsenodes.h Falling back to patching base and 3-way merge... Auto-merging src/include/nodes/parsenodes.h Auto-merging src/bin/psql/tab-complete.in.c 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 Auto-merging src/backend/replication/logical/worker.c Auto-merging src/backend/parser/gram.y Auto-merging src/backend/foreign/foreign.c Auto-merging contrib/postgres_fdw/sql/postgres_fdw.sql Auto-merging contrib/postgres_fdw/postgres_fdw--1.1--1.2.sql Auto-merging contrib/postgres_fdw/expected/postgres_fdw.out Auto-merging contrib/postgres_fdw/connection.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 CREATE SUSBCRIPTION ... SERVER. 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 contrib/postgres_fdw/Makefile M contrib/postgres_fdw/connection.c M contrib/postgres_fdw/expected/postgres_fdw.out M contrib/postgres_fdw/meson.build M contrib/postgres_fdw/postgres_fdw--1.1--1.2.sql M contrib/postgres_fdw/sql/postgres_fdw.sql M doc/src/sgml/ref/alter_subscription.sgml M doc/src/sgml/ref/create_subscription.sgml M src/backend/catalog/pg_subscription.c M src/backend/commands/foreigncmds.c M src/backend/commands/subscriptioncmds.c M src/backend/foreign/foreign.c M src/backend/parser/gram.y M src/backend/replication/logical/worker.c M src/bin/pg_dump/pg_dump.c M src/bin/pg_dump/pg_dump.h M src/bin/psql/tab-complete.in.c M src/include/catalog/pg_foreign_data_wrapper.h M src/include/catalog/pg_subscription.h M src/include/foreign/foreign.h M src/include/nodes/parsenodes.h M src/test/regress/expected/oidjoins.out Removing contrib/postgres_fdw/t/010_subscription.pl === using patch(1) to apply patch ./v14-0001-CREATE-SUSBCRIPTION-.-SERVER.patch === patching file contrib/postgres_fdw/Makefile patching file contrib/postgres_fdw/connection.c Hunk #2 succeeded at 2306 (offset 26 lines). patching file contrib/postgres_fdw/expected/postgres_fdw.out Hunk #1 succeeded at 267 (offset 11 lines). patching file contrib/postgres_fdw/meson.build patching file contrib/postgres_fdw/postgres_fdw--1.1--1.2.sql patching file contrib/postgres_fdw/sql/postgres_fdw.sql Hunk #1 succeeded at 256 (offset 8 lines). patching file contrib/postgres_fdw/t/010_subscription.pl patching file doc/src/sgml/ref/alter_subscription.sgml patching file doc/src/sgml/ref/create_subscription.sgml patching file src/backend/catalog/pg_subscription.c patching file src/backend/commands/foreigncmds.c patching file src/backend/commands/subscriptioncmds.c patching file src/backend/foreign/foreign.c Hunk #1 succeeded at 72 (offset 1 line). Hunk #2 succeeded at 177 (offset 1 line). Hunk #3 succeeded at 217 (offset 1 line). patching file src/backend/parser/gram.y Hunk #1 succeeded at 5459 (offset 22 lines). Hunk #2 succeeded at 10829 (offset 23 lines). Hunk #3 succeeded at 10868 (offset 23 lines). patching file src/backend/replication/logical/worker.c Hunk #1 succeeded at 3985 (offset -2 lines). Hunk #2 succeeded at 4091 (offset -2 lines). Hunk #3 succeeded at 4683 (offset 6 lines). Hunk #4 succeeded at 4720 (offset 6 lines). patching file src/bin/pg_dump/pg_dump.c Hunk #1 succeeded at 4952 (offset 58 lines). Hunk #2 FAILED at 4975. Hunk #3 succeeded at 5070 (offset 58 lines). Hunk #4 succeeded at 5092 (offset 58 lines). Hunk #5 succeeded at 5318 (offset 58 lines). 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 708 (offset 5 lines). patching file src/bin/psql/tab-complete.in.c Hunk #1 succeeded at 3714 (offset 10 lines). patching file src/include/catalog/pg_foreign_data_wrapper.h patching file src/include/catalog/pg_subscription.h patching file src/include/foreign/foreign.h patching file src/include/nodes/parsenodes.h Hunk #1 succeeded at 4291 (offset 9 lines). Hunk #2 succeeded at 4300 (offset 9 lines). Hunk #3 succeeded at 4315 (offset 9 lines). patching file src/test/regress/expected/oidjoins.out Unstaged changes after reset: M contrib/postgres_fdw/Makefile M contrib/postgres_fdw/connection.c M contrib/postgres_fdw/expected/postgres_fdw.out M contrib/postgres_fdw/meson.build M contrib/postgres_fdw/postgres_fdw--1.1--1.2.sql M contrib/postgres_fdw/sql/postgres_fdw.sql M doc/src/sgml/ref/alter_subscription.sgml M doc/src/sgml/ref/create_subscription.sgml M src/backend/catalog/pg_subscription.c M src/backend/commands/foreigncmds.c M src/backend/commands/subscriptioncmds.c M src/backend/foreign/foreign.c M src/backend/parser/gram.y M src/backend/replication/logical/worker.c M src/bin/pg_dump/pg_dump.c M src/bin/pg_dump/pg_dump.h M src/bin/psql/tab-complete.in.c M src/include/catalog/pg_foreign_data_wrapper.h M src/include/catalog/pg_subscription.h M src/include/foreign/foreign.h M src/include/nodes/parsenodes.h M src/test/regress/expected/oidjoins.out Removing contrib/postgres_fdw/t/010_subscription.pl Removing src/bin/pg_dump/pg_dump.c.rej === using 'git apply' to apply patch ./v14-0001-CREATE-SUSBCRIPTION-.-SERVER.patch === Applied patch to 'contrib/postgres_fdw/Makefile' cleanly. Applied patch to 'contrib/postgres_fdw/connection.c' cleanly. Applied patch to 'contrib/postgres_fdw/expected/postgres_fdw.out' cleanly. Applied patch to 'contrib/postgres_fdw/meson.build' cleanly. Applied patch to 'contrib/postgres_fdw/postgres_fdw--1.1--1.2.sql' cleanly. Applied patch to 'contrib/postgres_fdw/sql/postgres_fdw.sql' cleanly. Falling back to direct application... Applied patch to 'doc/src/sgml/ref/alter_subscription.sgml' cleanly. Applied patch to 'doc/src/sgml/ref/create_subscription.sgml' cleanly. Applied patch to 'src/backend/catalog/pg_subscription.c' cleanly. Applied patch to 'src/backend/commands/foreigncmds.c' cleanly. Applied patch to 'src/backend/commands/subscriptioncmds.c' cleanly. Applied patch to 'src/backend/foreign/foreign.c' cleanly. Applied patch to 'src/backend/parser/gram.y' cleanly. Applied patch to 'src/backend/replication/logical/worker.c' cleanly. 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/psql/tab-complete.in.c' cleanly. Applied patch to 'src/include/catalog/pg_foreign_data_wrapper.h' cleanly. Applied patch to 'src/include/catalog/pg_subscription.h' cleanly. Applied patch to 'src/include/foreign/foreign.h' cleanly. Applied patch to 'src/include/nodes/parsenodes.h' cleanly. Applied patch to 'src/test/regress/expected/oidjoins.out' cleanly. U src/bin/pg_dump/pg_dump.c diff --cc src/bin/pg_dump/pg_dump.c index 37432e66efd,a7a70535fa0..00000000000 --- a/src/bin/pg_dump/pg_dump.c +++ b/src/bin/pg_dump/pg_dump.c @@@ -5032,9 -4975,20 +5033,24 @@@ getSubscriptions(Archive *fout if (fout->remoteVersion >= 170000) appendPQExpBufferStr(query, - " s.subfailover\n"); + " s.subfailover,\n"); else ++<<<<<<< ours + appendPQExpBufferStr(query, ++======= + appendPQExpBuffer(query, + " false AS subfailover,\n"); + + if (dopt->binary_upgrade && fout->remoteVersion >= 180000) + appendPQExpBufferStr(query, " fs.srvname AS subservername,\n" + " o.remote_lsn AS suboriginremotelsn,\n" + " s.subenabled,\n" + " s.subfailover\n"); + else + appendPQExpBufferStr(query, " NULL AS subservername,\n" + " NULL AS suboriginremotelsn,\n" + " false AS subenabled,\n" ++>>>>>>> theirs " false AS subfailover\n"); appendPQExpBufferStr(query,