=== Applying patches on top of PostgreSQL commit ID f0178deecbb56283fda8f4c504c8fe16ce23e1a6 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Thu Aug 6 17:03:34 UTC 2026 On branch cf/7092 nothing to commit, working tree clean === using 'git am' to apply patch ./v4-0001-Add-a-hook-for-handling-logical-messages-on-subsc.patch === Applying: Add a hook for handling logical messages on subscribers. Using index info to reconstruct a base tree... M doc/src/sgml/ref/alter_subscription.sgml M src/backend/catalog/pg_subscription.c M src/backend/commands/subscriptioncmds.c M src/backend/replication/logical/worker.c M src/include/catalog/pg_subscription.h M src/test/regress/expected/subscription.out M src/test/regress/sql/subscription.sql Falling back to patching base and 3-way merge... Auto-merging src/test/regress/sql/subscription.sql Auto-merging src/test/regress/expected/subscription.out Auto-merging src/include/catalog/pg_subscription.h CONFLICT (content): Merge conflict in src/include/catalog/pg_subscription.h Auto-merging src/backend/replication/logical/worker.c Auto-merging src/backend/commands/subscriptioncmds.c Auto-merging src/backend/catalog/pg_subscription.c Auto-merging doc/src/sgml/ref/alter_subscription.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 Add a hook for handling logical messages on subscribers. 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 ./v4-0001-Add-a-hook-for-handling-logical-messages-on-subsc.patch === patching file doc/src/sgml/catalogs.sgml patching file doc/src/sgml/func/func-admin.sgml patching file doc/src/sgml/ref/alter_subscription.sgml Hunk #1 succeeded at 302 (offset -7 lines). patching file doc/src/sgml/ref/create_subscription.sgml patching file src/backend/catalog/pg_subscription.c Hunk #1 succeeded at 133 with fuzz 2 (offset -6 lines). patching file src/backend/catalog/system_views.sql patching file src/backend/commands/subscriptioncmds.c Hunk #6 succeeded at 884 (offset 17 lines). Hunk #7 succeeded at 1712 (offset 32 lines). Hunk #8 succeeded at 2119 (offset 51 lines). patching file src/backend/replication/libpqwalreceiver/libpqwalreceiver.c patching file src/backend/replication/logical/proto.c patching file src/backend/replication/logical/worker.c Hunk #1 succeeded at 550 (offset 1 line). Hunk #2 succeeded at 1698 (offset 1 line). Hunk #3 succeeded at 3915 (offset 1 line). Hunk #4 succeeded at 5201 (offset 10 lines). Hunk #5 succeeded at 5693 (offset 15 lines). patching file src/bin/pg_dump/pg_dump.c patching file src/bin/pg_dump/pg_dump.h patching file src/bin/pg_dump/t/002_pg_dump.pl patching file src/bin/psql/describe.c patching file src/include/catalog/pg_subscription.h Hunk #2 FAILED at 176. 1 out of 2 hunks FAILED -- saving rejects to file src/include/catalog/pg_subscription.h.rej patching file src/include/replication/logicalproto.h patching file src/include/replication/logicalworker.h patching file src/include/replication/walreceiver.h patching file src/test/modules/Makefile patching file src/test/modules/meson.build patching file src/test/modules/test_logicalmsg_hooks/.gitignore patching file src/test/modules/test_logicalmsg_hooks/Makefile patching file src/test/modules/test_logicalmsg_hooks/meson.build patching file src/test/modules/test_logicalmsg_hooks/t/001_basic.pl patching file src/test/modules/test_logicalmsg_hooks/test_logicalmsg_hooks.c patching file src/test/regress/expected/subscription.out Hunk #1 succeeded at 139 (offset -4 lines). Hunk #2 succeeded at 255 (offset -3 lines). Hunk #3 succeeded at 267 (offset -3 lines). Hunk #4 succeeded at 286 (offset -3 lines). Hunk #5 succeeded at 298 (offset -3 lines). Hunk #6 succeeded at 337 (offset -3 lines). Hunk #7 succeeded at 369 (offset -3 lines). Hunk #8 succeeded at 393 (offset -3 lines). Hunk #9 succeeded at 428 (offset -3 lines). Hunk #10 succeeded at 446 (offset -3 lines). Hunk #11 succeeded at 485 (offset -3 lines). Hunk #12 succeeded at 507 (offset -3 lines). Hunk #13 succeeded at 523 (offset -3 lines). Hunk #14 succeeded at 547 (offset -3 lines). Hunk #15 succeeded at 567 (offset -3 lines). Hunk #16 succeeded at 579 (offset -3 lines). patching file src/test/regress/sql/subscription.sql Hunk #1 succeeded at 439 (offset -2 lines). patching file src/tools/pgindent/typedefs.list Unstaged changes after reset: M doc/src/sgml/catalogs.sgml M doc/src/sgml/func/func-admin.sgml 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/catalog/system_views.sql M src/backend/commands/subscriptioncmds.c M src/backend/replication/libpqwalreceiver/libpqwalreceiver.c M src/backend/replication/logical/proto.c 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/pg_dump/t/002_pg_dump.pl M src/bin/psql/describe.c M src/include/catalog/pg_subscription.h M src/include/replication/logicalproto.h M src/include/replication/logicalworker.h M src/include/replication/walreceiver.h M src/test/modules/Makefile M src/test/modules/meson.build M src/test/regress/expected/subscription.out M src/test/regress/sql/subscription.sql M src/tools/pgindent/typedefs.list Removing src/include/catalog/pg_subscription.h.rej Removing src/test/modules/test_logicalmsg_hooks/ === using 'git apply' to apply patch ./v4-0001-Add-a-hook-for-handling-logical-messages-on-subsc.patch === Applied patch to 'doc/src/sgml/catalogs.sgml' cleanly. Applied patch to 'doc/src/sgml/func/func-admin.sgml' cleanly. 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/catalog/system_views.sql' cleanly. Applied patch to 'src/backend/commands/subscriptioncmds.c' cleanly. Applied patch to 'src/backend/replication/libpqwalreceiver/libpqwalreceiver.c' cleanly. Applied patch to 'src/backend/replication/logical/proto.c' cleanly. Applied patch to 'src/backend/replication/logical/worker.c' cleanly. Applied patch to 'src/bin/pg_dump/pg_dump.c' cleanly. Applied patch to 'src/bin/pg_dump/pg_dump.h' cleanly. Applied patch to 'src/bin/pg_dump/t/002_pg_dump.pl' cleanly. Applied patch to 'src/bin/psql/describe.c' cleanly. Applied patch to 'src/include/catalog/pg_subscription.h' with conflicts. Applied patch to 'src/include/replication/logicalproto.h' cleanly. Applied patch to 'src/include/replication/logicalworker.h' cleanly. Applied patch to 'src/include/replication/walreceiver.h' cleanly. Applied patch to 'src/test/modules/Makefile' cleanly. Applied patch to 'src/test/modules/meson.build' cleanly. Falling back to direct application... Falling back to direct application... Falling back to direct application... Falling back to direct application... Falling back to direct application... Applied patch to 'src/test/regress/expected/subscription.out' cleanly. Applied patch to 'src/test/regress/sql/subscription.sql' cleanly. Applied patch to 'src/tools/pgindent/typedefs.list' cleanly. U src/include/catalog/pg_subscription.h diff --cc src/include/catalog/pg_subscription.h index d2781a0b837,650663b71fd..00000000000 --- a/src/include/catalog/pg_subscription.h +++ b/src/include/catalog/pg_subscription.h @@@ -173,6 -176,9 +176,12 @@@ typedef struct Subscriptio * exceeded max_retention_duration, when * defined */ Oid conflictlogrelid; /* conflict log table Oid */ ++<<<<<<< ours ++======= + bool messages; /* True if the subscription wants to receive + * logical messages */ + char *conninfo; /* Connection string to the publisher */ ++>>>>>>> theirs char *slotname; /* Name of the replication slot */ char *synccommit; /* Synchronous commit setting for worker */ char *walrcvtimeout; /* wal_receiver_timeout setting for worker */