=== Applying patches on top of PostgreSQL commit ID 43493cceda2fb75e07a63cec46000407661d505d ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sat Feb  1 15:05:22 UTC 2025
On branch cf/4529
nothing to commit, working tree clean
=== applying patch ./v13-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' with conflicts.
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' cleanly.
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 contrib/postgres_fdw/meson.build
diff --cc contrib/postgres_fdw/meson.build
index 8b29be24de,e19d8e4e31..0000000000
--- a/contrib/postgres_fdw/meson.build
+++ b/contrib/postgres_fdw/meson.build
@@@ -43,7 -43,7 +43,11 @@@ tests += 
    },
    'tap': {
      'tests': [
++<<<<<<< ours
 +      't/001_auth_scram.pl',
++=======
+       't/010_subscription.pl',
++>>>>>>> theirs
      ],
    },
  }