=== 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:12:30 UTC 2026 On branch cf/6064 nothing to commit, working tree clean === using 'git am' to apply patch ./v3-0001-CREATE-TABLE-LIKE-INCLUDING-POLICIES.patch === Applying: CREATE TABLE LIKE (INCLUDING POLICIES) Using index info to reconstruct a base tree... M doc/src/sgml/ref/create_table.sgml M src/backend/commands/policy.c M src/backend/parser/gram.y M src/backend/parser/parse_utilcmd.c 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/expected/rowsecurity.out M src/test/regress/sql/create_table_like.sql M src/test/regress/sql/rowsecurity.sql Falling back to patching base and 3-way merge... Auto-merging src/test/regress/sql/rowsecurity.sql Auto-merging src/test/regress/sql/create_table_like.sql Auto-merging src/test/regress/expected/rowsecurity.out 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/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/commands/policy.c Auto-merging doc/src/sgml/ref/create_table.sgml CONFLICT (content): Merge conflict in 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 CREATE TABLE LIKE (INCLUDING POLICIES) 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 ./v3-0001-CREATE-TABLE-LIKE-INCLUDING-POLICIES.patch === patching file doc/src/sgml/ref/create_table.sgml Hunk #1 succeeded at 100 (offset 12 lines). Hunk #2 FAILED at 672. Hunk #3 succeeded at 774 (offset 21 lines). 1 out of 3 hunks FAILED -- saving rejects to file doc/src/sgml/ref/create_table.sgml.rej patching file src/backend/commands/policy.c Hunk #2 succeeded at 626 (offset 12 lines). Hunk #3 succeeded at 672 (offset 12 lines). Hunk #4 succeeded at 791 (offset 12 lines). Hunk #5 succeeded at 1318 (offset 12 lines). patching file src/backend/parser/gram.y Hunk #1 FAILED at 766. Hunk #2 succeeded at 4361 (offset 67 lines). Hunk #3 succeeded at 6098 (offset 69 lines). Hunk #4 succeeded at 19120 with fuzz 2 (offset 1014 lines). Hunk #5 succeeded at 19766 with fuzz 2 (offset 1026 lines). 1 out of 5 hunks FAILED -- saving rejects to file src/backend/parser/gram.y.rej patching file src/backend/parser/parse_utilcmd.c Hunk #1 succeeded at 39 (offset 1 line). Hunk #2 succeeded at 65 (offset 1 line). Hunk #3 succeeded at 116 (offset -11 lines). Hunk #4 succeeded at 1126 (offset -5 lines). Hunk #5 succeeded at 1311 (offset -5 lines). Hunk #6 succeeded at 1325 (offset -5 lines). Hunk #7 succeeded at 1592 (offset -5 lines). Hunk #8 succeeded at 2124 (offset -5 lines). patching file src/include/commands/policy.h patching file src/include/nodes/parsenodes.h Hunk #1 succeeded at 812 (offset 17 lines). Hunk #2 succeeded at 3220 (offset 119 lines). patching file src/include/parser/kwlist.h Hunk #1 succeeded at 352 with fuzz 2 (offset 5 lines). patching file src/test/regress/expected/create_table_like.out Hunk #1 succeeded at 612 (offset 4 lines). Hunk #2 succeeded at 631 (offset 4 lines). Hunk #3 succeeded at 670 (offset 4 lines). patching file src/test/regress/expected/rowsecurity.out Hunk #1 succeeded at 488 (offset 82 lines). Hunk #2 succeeded at 1430 (offset 83 lines). Hunk #3 succeeded at 4547 (offset 131 lines). Hunk #4 succeeded at 5375 (offset 131 lines). patching file src/test/regress/sql/create_table_like.sql patching file src/test/regress/sql/rowsecurity.sql Hunk #1 succeeded at 297 (offset 47 lines). Hunk #2 succeeded at 615 (offset 47 lines). Hunk #3 succeeded at 2073 (offset 87 lines). Unstaged changes after reset: M doc/src/sgml/ref/create_table.sgml M src/backend/commands/policy.c M src/backend/parser/gram.y M src/backend/parser/parse_utilcmd.c M src/include/commands/policy.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/expected/rowsecurity.out M src/test/regress/sql/create_table_like.sql M src/test/regress/sql/rowsecurity.sql Removing doc/src/sgml/ref/create_table.sgml.rej Removing src/backend/parser/gram.y.rej === using 'git apply' to apply patch ./v3-0001-CREATE-TABLE-LIKE-INCLUDING-POLICIES.patch === Applied patch to 'doc/src/sgml/ref/create_table.sgml' with conflicts. Applied patch to 'src/backend/commands/policy.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/commands/policy.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/expected/rowsecurity.out' cleanly. Applied patch to 'src/test/regress/sql/create_table_like.sql' cleanly. Applied patch to 'src/test/regress/sql/rowsecurity.sql' cleanly. U doc/src/sgml/ref/create_table.sgml U src/backend/parser/gram.y diff --cc doc/src/sgml/ref/create_table.sgml index e342585c7f0,eda0bc847fb..00000000000 --- a/doc/src/sgml/ref/create_table.sgml +++ b/doc/src/sgml/ref/create_table.sgml @@@ -692,10 -672,9 +692,16 @@@ WITH ( MODULUS