=== Applying patches on top of PostgreSQL commit ID 798bdcae89debabc59fa8afc6d690fec584db32f === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Sun Sep 6 19:56:28 UTC 2026 On branch cf/6736 nothing to commit, working tree clean === using 'git am' to apply patch ./v4-0001-export-ExecInsert.patch === Applying: export ExecInsert === using 'git am' to apply patch ./v4-0002-COPY-ON_CONFLICT-TABLE.patch === Applying: COPY ON_CONFLICT TABLE error: sha1 information is lacking or useless (src/backend/executor/nodeModifyTable.c). error: could not build fake ancestor hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 COPY ON_CONFLICT TABLE 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 ./v4-0002-COPY-ON_CONFLICT-TABLE.patch === patching file doc/src/sgml/monitoring.sgml Hunk #1 succeeded at 7074 (offset 330 lines). patching file doc/src/sgml/ref/copy.sgml patching file src/backend/commands/copy.c patching file src/backend/commands/copyfrom.c Hunk #6 succeeded at 1006 with fuzz 2. patching file src/backend/commands/explain.c Hunk #1 succeeded at 4862 (offset 5 lines). patching file src/backend/executor/nodeModifyTable.c Hunk #1 succeeded at 827 (offset 2 lines). Hunk #2 succeeded at 842 (offset 2 lines). Hunk #3 succeeded at 1127 (offset 2 lines). Hunk #4 succeeded at 1586 (offset -3 lines). Hunk #5 succeeded at 2326 (offset -3 lines). Hunk #6 succeeded at 4107 (offset 16 lines). Hunk #7 succeeded at 4948 (offset 26 lines). patching file src/backend/parser/gram.y Hunk #1 succeeded at 3713 (offset -42 lines). patching file src/include/commands/copy.h patching file src/include/commands/copyfrom_internal.h patching file src/include/executor/nodeModifyTable.h patching file src/include/nodes/nodes.h Hunk #1 succeeded at 421 (offset -8 lines). patching file src/test/regress/expected/copy.out Hunk #1 succeeded at 439 (offset 9 lines). patching file src/test/regress/expected/copy2.out patching file src/test/regress/expected/insert_conflict.out patching file src/test/regress/expected/rangetypes.out patching file src/test/regress/sql/copy.sql Hunk #1 succeeded at 379 (offset 10 lines). patching file src/test/regress/sql/copy2.sql Hunk #1 succeeded at 687 (offset 47 lines). patching file src/test/regress/sql/insert_conflict.sql patching file src/test/regress/sql/rangetypes.sql [cf/6736 158a2ebf5c1] COPY ON_CONFLICT TABLE Author: jian he Date: Wed May 27 21:32:58 2026 +0800 19 files changed, 1214 insertions(+), 19 deletions(-)