=== Applying patches on top of PostgreSQL commit ID 903d9d12cc0adcd9a7f92c7b35333e9e40756fbf === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Thu Sep 3 20:40:27 UTC 2026 On branch cf/6088 nothing to commit, working tree clean === using 'git am' to apply patch ./v9-0001-Add-INCLUDING-PARAMETERS-to-CREATE-TABLE-LIKE.patch === Applying: Add INCLUDING PARAMETERS to CREATE TABLE LIKE Using index info to reconstruct a base tree... M doc/src/sgml/ref/create_table.sgml M src/backend/access/common/reloptions.c M src/backend/parser/gram.y M src/backend/parser/parse_utilcmd.c M src/include/access/reloptions.h M src/include/nodes/parsenodes.h M src/include/parser/kwlist.h M src/test/regress/expected/create_table_like.out M src/test/regress/sql/create_table_like.sql Falling back to patching base and 3-way merge... Auto-merging src/test/regress/sql/create_table_like.sql Auto-merging src/test/regress/expected/create_table_like.out Auto-merging src/include/parser/kwlist.h Auto-merging src/include/nodes/parsenodes.h Auto-merging src/include/access/reloptions.h Auto-merging src/backend/parser/parse_utilcmd.c Auto-merging src/backend/parser/gram.y CONFLICT (content): Merge conflict in src/backend/parser/gram.y Auto-merging src/backend/access/common/reloptions.c Auto-merging doc/src/sgml/ref/create_table.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 INCLUDING PARAMETERS to CREATE TABLE LIKE 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 ./v9-0001-Add-INCLUDING-PARAMETERS-to-CREATE-TABLE-LIKE.patch === patching file doc/src/sgml/ref/create_table.sgml patching file src/backend/access/common/reloptions.c Hunk #1 succeeded at 1521 (offset 82 lines). Hunk #2 succeeded at 1558 (offset 82 lines). patching file src/backend/parser/gram.y Hunk #1 FAILED at 801. Hunk #2 succeeded at 4311 (offset -39 lines). Hunk #3 succeeded at 19056 (offset 35 lines). Hunk #4 succeeded at 19699 (offset 33 lines). 1 out of 4 hunks FAILED -- saving rejects to file src/backend/parser/gram.y.rej patching file src/backend/parser/parse_utilcmd.c Hunk #1 succeeded at 86 (offset -3 lines). Hunk #2 succeeded at 242 (offset -9 lines). Hunk #3 succeeded at 367 (offset -9 lines). Hunk #4 succeeded at 1118 (offset -9 lines). Hunk #5 succeeded at 1267 (offset -9 lines). Hunk #6 succeeded at 3684 (offset -256 lines). patching file src/include/access/reloptions.h patching file src/include/nodes/parsenodes.h Hunk #1 succeeded at 812 (offset 1 line). patching file src/include/parser/kwlist.h patching file src/test/regress/expected/create_table_like.out Hunk #4 succeeded at 736 (offset 31 lines). patching file src/test/regress/sql/create_table_like.sql Hunk #3 succeeded at 307 (offset 26 lines). Unstaged changes after reset: M doc/src/sgml/ref/create_table.sgml M src/backend/access/common/reloptions.c M src/backend/parser/gram.y M src/backend/parser/parse_utilcmd.c M src/include/access/reloptions.h M src/include/nodes/parsenodes.h M src/include/parser/kwlist.h M src/test/regress/expected/create_table_like.out M src/test/regress/sql/create_table_like.sql Removing src/backend/parser/gram.y.rej === using 'git apply' to apply patch ./v9-0001-Add-INCLUDING-PARAMETERS-to-CREATE-TABLE-LIKE.patch === Applied patch to 'doc/src/sgml/ref/create_table.sgml' cleanly. Applied patch to 'src/backend/access/common/reloptions.c' cleanly. Applied patch to 'src/backend/parser/gram.y' with conflicts. Applied patch to 'src/backend/parser/parse_utilcmd.c' cleanly. Applied patch to 'src/include/access/reloptions.h' cleanly. Applied patch to 'src/include/nodes/parsenodes.h' cleanly. Applied patch to 'src/include/parser/kwlist.h' cleanly. Applied patch to 'src/test/regress/expected/create_table_like.out' cleanly. Applied patch to 'src/test/regress/sql/create_table_like.sql' cleanly. U src/backend/parser/gram.y diff --cc src/backend/parser/gram.y index c025eaaaa4e,d09f4c8f99d..00000000000 --- a/src/backend/parser/gram.y +++ b/src/backend/parser/gram.y @@@ -808,7 -801,7 +808,11 @@@ static Node *makeRecursiveViewSelect(ch ORDER ORDINALITY OTHERS OUT_P OUTER_P OVER OVERLAPS OVERLAY OVERRIDING OWNED OWNER ++<<<<<<< ours + PARALLEL PARAMETER PARSER PARTIAL PARTITION PASSING PASSWORD PATH ++======= + PARALLEL PARAMETER PARAMETERS PARSER PARTIAL PARTITION PARTITIONS PASSING PASSWORD PATH ++>>>>>>> theirs PERIOD PLACING PLAN PLANS POLICY PORTION POSITION PRECEDING PRECISION PRESERVE PREPARE PREPARED PRIMARY PRIOR PRIVILEGES PROCEDURAL PROCEDURE PROCEDURES PROGRAM PROPERTIES PROPERTY PUBLICATION