=== Applying patches on top of PostgreSQL commit ID 53a49365052026907afff7613929710d1e7f0da0 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sat Feb  1 06:02:28 UTC 2025
On branch cf/4972
nothing to commit, working tree clean
=== applying patch ./v13-0001-Virtual-generated-columns.patch
Applied patch to 'contrib/pageinspect/expected/page.out' cleanly.
Applied patch to 'contrib/pageinspect/sql/page.sql' cleanly.
Applied patch to 'contrib/postgres_fdw/expected/postgres_fdw.out' cleanly.
Applied patch to 'contrib/postgres_fdw/sql/postgres_fdw.sql' cleanly.
Applied patch to 'doc/src/sgml/catalogs.sgml' cleanly.
Applied patch to 'doc/src/sgml/ddl.sgml' with conflicts.
Applied patch to 'doc/src/sgml/ref/alter_table.sgml' cleanly.
Applied patch to 'doc/src/sgml/ref/create_foreign_table.sgml' cleanly.
Applied patch to 'doc/src/sgml/ref/create_table.sgml' cleanly.
Applied patch to 'doc/src/sgml/trigger.sgml' cleanly.
Applied patch to 'src/backend/access/common/tupdesc.c' cleanly.
Applied patch to 'src/backend/access/heap/heapam_handler.c' cleanly.
Applied patch to 'src/backend/catalog/heap.c' cleanly.
Applied patch to 'src/backend/catalog/pg_publication.c' cleanly.
Applied patch to 'src/backend/commands/analyze.c' cleanly.
Applied patch to 'src/backend/commands/indexcmds.c' cleanly.
Applied patch to 'src/backend/commands/publicationcmds.c' cleanly.
Applied patch to 'src/backend/commands/statscmds.c' cleanly.
Applied patch to 'src/backend/commands/tablecmds.c' cleanly.
Applied patch to 'src/backend/commands/trigger.c' cleanly.
Applied patch to 'src/backend/executor/execExprInterp.c' cleanly.
Applied patch to 'src/backend/executor/execMain.c' cleanly.
Applied patch to 'src/backend/executor/execUtils.c' cleanly.
Applied patch to 'src/backend/executor/nodeModifyTable.c' cleanly.
Applied patch to 'src/backend/parser/gram.y' cleanly.
Applied patch to 'src/backend/parser/parse_relation.c' cleanly.
Applied patch to 'src/backend/parser/parse_utilcmd.c' cleanly.
Applied patch to 'src/backend/replication/pgoutput/pgoutput.c' cleanly.
Applied patch to 'src/backend/rewrite/rewriteHandler.c' cleanly.
Applied patch to 'src/backend/utils/cache/relcache.c' cleanly.
Applied patch to 'src/bin/pg_dump/pg_dump.c' 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/access/tupdesc.h' cleanly.
Applied patch to 'src/include/catalog/catversion.h' with conflicts.
Applied patch to 'src/include/catalog/heap.h' cleanly.
Applied patch to 'src/include/catalog/pg_attribute.h' cleanly.
Applied patch to 'src/include/executor/nodeModifyTable.h' cleanly.
Applied patch to 'src/include/nodes/execnodes.h' cleanly.
Applied patch to 'src/include/nodes/parsenodes.h' cleanly.
Applied patch to 'src/include/parser/kwlist.h' cleanly.
Applied patch to 'src/include/rewrite/rewriteHandler.h' cleanly.
Applied patch to 'src/pl/plperl/expected/plperl_trigger.out' cleanly.
Applied patch to 'src/pl/plperl/plperl.c' cleanly.
Applied patch to 'src/pl/plperl/sql/plperl_trigger.sql' cleanly.
Applied patch to 'src/pl/plpython/expected/plpython_trigger.out' cleanly.
Applied patch to 'src/pl/plpython/plpy_typeio.c' cleanly.
Applied patch to 'src/pl/plpython/sql/plpython_trigger.sql' cleanly.
Applied patch to 'src/pl/tcl/expected/pltcl_trigger.out' cleanly.
Applied patch to 'src/pl/tcl/pltcl.c' cleanly.
Applied patch to 'src/pl/tcl/sql/pltcl_trigger.sql' cleanly.
Applied patch to 'src/test/regress/expected/collate.icu.utf8.out' cleanly.
Applied patch to 'src/test/regress/expected/create_table_like.out' cleanly.
Applied patch to 'src/test/regress/expected/fast_default.out' cleanly.
Applied patch to 'src/test/regress/expected/generated_stored.out' cleanly.
Applied patch to 'src/test/regress/expected/generated_virtual.out' cleanly.
Applied patch to 'src/test/regress/expected/publication.out' cleanly.
Applied patch to 'src/test/regress/expected/rowsecurity.out' cleanly.
Applied patch to 'src/test/regress/expected/stats_ext.out' cleanly.
Applied patch to 'src/test/regress/parallel_schedule' cleanly.
Applied patch to 'src/test/regress/sql/collate.icu.utf8.sql' cleanly.
Applied patch to 'src/test/regress/sql/create_table_like.sql' cleanly.
Applied patch to 'src/test/regress/sql/fast_default.sql' cleanly.
Applied patch to 'src/test/regress/sql/generated_stored.sql' cleanly.
Applied patch to 'src/test/regress/sql/generated_virtual.sql' cleanly.
Applied patch to 'src/test/regress/sql/publication.sql' cleanly.
Applied patch to 'src/test/regress/sql/rowsecurity.sql' cleanly.
Applied patch to 'src/test/regress/sql/stats_ext.sql' cleanly.
Applied patch to 'src/test/subscription/t/011_generated.pl' cleanly.
Applied patch to 'src/test/subscription/t/028_row_filter.pl' cleanly.
Applied patch to 'src/test/subscription/t/031_column_list.pl' cleanly.
U doc/src/sgml/ddl.sgml
U src/include/catalog/catversion.h
diff --cc doc/src/sgml/ddl.sgml
index 7ff39ae8c6,482785370f..0000000000
--- a/doc/src/sgml/ddl.sgml
+++ b/doc/src/sgml/ddl.sgml
@@@ -519,7 -544,7 +544,11 @@@ CREATE TABLE people 
        <link linkend="sql-createpublication-params-with-publish-generated-columns">
        <literal>publish_generated_columns</literal></link> or by including them
        in the column list of the <command>CREATE PUBLICATION</command> command.
++<<<<<<< ours
 +      See <xref linkend="logical-replication-gencols"/> for details.
++=======
+       This is currently only supported for stored generated columns.
++>>>>>>> theirs
       </para>
      </listitem>
     </itemizedlist>
diff --cc src/include/catalog/catversion.h
index 6edaa20368,8b9a8453f7..0000000000
--- a/src/include/catalog/catversion.h
+++ b/src/include/catalog/catversion.h
@@@ -57,6 -57,6 +57,10 @@@
   */
  
  /*							yyyymmddN */
++<<<<<<< ours
 +#define CATALOG_VERSION_NO	202501282
++=======
+ #define CATALOG_VERSION_NO	202501271
++>>>>>>> theirs
  
  #endif