=== Applying patches on top of PostgreSQL commit ID 972c14fb9134fdfd76ea6ebcf98a55a945bbc988 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Wed Apr 15 04:31:26 UTC 2026 On branch cf/6054 nothing to commit, working tree clean === using 'git am' to apply patch ./v3-0001-add-RangeTblEntry-to-CreatePolicyStmt.patch === Applying: add RangeTblEntry to CreatePolicyStmt === using 'git am' to apply patch ./v3-0002-refactoring-CreatePolicy-split-policy-qual-check-qual.patch === Applying: refactoring CreatePolicy: split policy qual, check qual error: sha1 information is lacking or useless (src/backend/commands/policy.c). error: could not build fake ancestor hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 refactoring CreatePolicy: split policy qual, check qual 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-0002-refactoring-CreatePolicy-split-policy-qual-check-qual.patch === patching file src/backend/commands/policy.c patching file src/backend/parser/gram.y Hunk #1 succeeded at 6088 (offset 59 lines). patching file src/backend/parser/parse_utilcmd.c Hunk #1 succeeded at 3214 (offset 6 lines). patching file src/backend/tcop/utility.c Hunk #1 succeeded at 1839 (offset 13 lines). patching file src/include/commands/policy.h patching file src/include/nodes/parsenodes.h Hunk #1 succeeded at 3190 (offset 81 lines). patching file src/include/parser/parse_utilcmd.h Hunk #1 succeeded at 28 with fuzz 1. [cf/6054 a227bad93ce] refactoring CreatePolicy: split policy qual, check qual Author: jian he Date: Tue Dec 23 09:58:44 2025 +0800 7 files changed, 86 insertions(+), 39 deletions(-) === using 'git am' to apply patch ./v3-0003-ALTER-TABLE-command-to-change-policy.patch === Applying: ALTER TABLE command to change policy error: sha1 information is lacking or useless (src/backend/commands/policy.c). error: could not build fake ancestor hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 ALTER TABLE command to change policy 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-0003-ALTER-TABLE-command-to-change-policy.patch === patching file src/backend/commands/policy.c patching file src/backend/commands/tablecmds.c Hunk #1 FAILED at 60. Hunk #2 succeeded at 209 (offset 1 line). Hunk #3 succeeded at 563 (offset 15 lines). Hunk #4 succeeded at 667 (offset 15 lines). Hunk #5 succeeded at 5505 (offset 34 lines). Hunk #6 succeeded at 6798 (offset 36 lines). Hunk #7 succeeded at 9785 (offset 49 lines). Hunk #8 succeeded at 15122 (offset 218 lines). Hunk #9 succeeded at 15323 (offset 218 lines). Hunk #10 succeeded at 15560 (offset 218 lines). Hunk #11 succeeded at 15803 (offset 218 lines). Hunk #12 succeeded at 15968 (offset 218 lines). Hunk #13 succeeded at 16045 (offset 218 lines). Hunk #14 succeeded at 16098 (offset 218 lines). Hunk #15 succeeded at 16263 (offset 218 lines). 1 out of 15 hunks FAILED -- saving rejects to file src/backend/commands/tablecmds.c.rej patching file src/backend/parser/gram.y Hunk #1 succeeded at 6089 (offset 59 lines). patching file src/backend/utils/adt/ruleutils.c Hunk #1 FAILED at 33. Hunk #2 succeeded at 375 (offset 8 lines). Hunk #3 succeeded at 2970 (offset 359 lines). 1 out of 3 hunks FAILED -- saving rejects to file src/backend/utils/adt/ruleutils.c.rej patching file src/include/commands/policy.h patching file src/include/nodes/parsenodes.h Hunk #1 succeeded at 2589 (offset 81 lines). Hunk #2 succeeded at 3187 (offset 81 lines). patching file src/include/utils/ruleutils.h patching file src/test/modules/test_ddl_deparse/test_ddl_deparse.c Hunk #1 succeeded at 315 (offset 1 line). patching file src/test/regress/expected/rowsecurity.out Hunk #2 succeeded at 2752 (offset 94 lines). patching file src/test/regress/sql/rowsecurity.sql Hunk #2 succeeded at 1238 (offset 56 lines). Unstaged changes after reset: M src/backend/commands/policy.c M src/backend/commands/tablecmds.c M src/backend/parser/gram.y M src/backend/utils/adt/ruleutils.c M src/include/commands/policy.h M src/include/nodes/parsenodes.h M src/include/utils/ruleutils.h M src/test/modules/test_ddl_deparse/test_ddl_deparse.c M src/test/regress/expected/rowsecurity.out M src/test/regress/sql/rowsecurity.sql Removing src/backend/commands/tablecmds.c.rej Removing src/backend/utils/adt/ruleutils.c.rej === using 'git apply' to apply patch ./v3-0003-ALTER-TABLE-command-to-change-policy.patch === error: repository lacks the necessary blob to perform 3-way merge. Falling back to direct application... Applied patch to 'src/backend/commands/tablecmds.c' with conflicts. error: repository lacks the necessary blob to perform 3-way merge. Falling back to direct application... Applied patch to 'src/backend/utils/adt/ruleutils.c' cleanly. error: repository lacks the necessary blob to perform 3-way merge. Falling back to direct application... error: repository lacks the necessary blob to perform 3-way merge. Falling back to direct application... Applied patch to 'src/include/utils/ruleutils.h' cleanly. Applied patch to 'src/test/modules/test_ddl_deparse/test_ddl_deparse.c' cleanly. Applied patch to 'src/test/regress/expected/rowsecurity.out' cleanly. Applied patch to 'src/test/regress/sql/rowsecurity.sql' cleanly. U src/backend/commands/tablecmds.c diff --cc src/backend/commands/tablecmds.c index eec09ba1ded,cc1cfe9bf1d..00000000000 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@@ -60,7 -59,8 +60,11 @@@ #include "commands/comment.h" #include "commands/defrem.h" #include "commands/event_trigger.h" ++<<<<<<< ours +#include "commands/repack.h" ++======= + #include "commands/policy.h" ++>>>>>>> theirs #include "commands/sequence.h" #include "commands/tablecmds.h" #include "commands/tablespace.h"