=== Applying patches on top of PostgreSQL commit ID f95d73ed433207c4323802dc96e52f3e5553a86c === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Fri Mar 6 01:23:23 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/parser/gram.y M src/backend/parser/parse_utilcmd.c M src/include/nodes/parsenodes.h M src/test/regress/expected/rowsecurity.out 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/expected/rowsecurity.out Auto-merging src/include/nodes/parsenodes.h Auto-merging src/backend/parser/parse_utilcmd.c Auto-merging src/backend/parser/gram.y 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". 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 === using patch(1) to apply patch ./v3-0001-CREATE-TABLE-LIKE-INCLUDING-POLICIES.patch === patching file doc/src/sgml/ref/create_table.sgml Hunk #2 FAILED at 672. Hunk #3 succeeded at 754 (offset 1 line). 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 patching file src/backend/parser/gram.y Hunk #1 succeeded at 769 (offset 3 lines). Hunk #2 succeeded at 4297 (offset 3 lines). Hunk #3 succeeded at 6032 (offset 3 lines). Hunk #4 succeeded at 18151 (offset 45 lines). Hunk #5 succeeded at 18785 (offset 45 lines). patching file src/backend/parser/parse_utilcmd.c patching file src/include/commands/policy.h patching file src/include/nodes/parsenodes.h Hunk #2 succeeded at 3103 (offset 2 lines). patching file src/include/parser/kwlist.h patching file src/test/regress/expected/create_table_like.out patching file src/test/regress/expected/rowsecurity.out Hunk #1 succeeded at 451 (offset 45 lines). Hunk #2 succeeded at 1392 (offset 45 lines). Hunk #3 succeeded at 4509 (offset 93 lines). Hunk #4 succeeded at 5337 (offset 93 lines). patching file src/test/regress/sql/create_table_like.sql patching file src/test/regress/sql/rowsecurity.sql Hunk #1 succeeded at 266 (offset 16 lines). Hunk #2 succeeded at 584 (offset 16 lines). Hunk #3 succeeded at 2042 (offset 56 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 === 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' cleanly. 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 diff --cc doc/src/sgml/ref/create_table.sgml index 982532fe725,eda0bc847fb..00000000000 --- a/doc/src/sgml/ref/create_table.sgml +++ b/doc/src/sgml/ref/create_table.sgml @@@ -672,10 -672,9 +672,16 @@@ WITH ( MODULUS