=== Applying patches on top of PostgreSQL commit ID a27893df45ec5d8c657899202e9cf0b9a816fe2f === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Tue Jul 8 09:29:22 UTC 2025 On branch cf/5764 nothing to commit, working tree clean === using 'git am' to apply patch ./REL14_v4-0001-Fix-tab-completion-for-COPY-and-copy-options.patch === Applying: Fix tab-completion for COPY and \copy options. Using index info to reconstruct a base tree... A src/bin/psql/tab-complete.c Falling back to patching base and 3-way merge... Auto-merging src/bin/psql/tab-complete.in.c CONFLICT (content): Merge conflict in src/bin/psql/tab-complete.in.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 Fix tab-completion for COPY and \copy options. 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 src/bin/psql/tab-complete.in.c === using patch(1) to apply patch ./REL14_v4-0001-Fix-tab-completion-for-COPY-and-copy-options.patch === can't find file to patch at input line 30 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |From 4b0b26565813f13ab1b05b335d93ab7c67cf1376 Mon Sep 17 00:00:00 2001 |From: Atsushi Torikoshi |Date: Wed, 2 Jul 2025 14:26:32 +0900 |Subject: [PATCH v4] Fix tab-completion for COPY and \copy options. | |Commit c273d9d8ce4 reworked tab-completion of COPY and \copy in psql |and added support for completing options within WITH clauses. However, |the same COPY options were suggested for both COPY TO and COPY FROM |commands, even though some options are only valid for one or the |other. | |This commit separates the COPY options for COPY FROM and COPY TO |commands to provide more accurate auto-completion suggestions. | |Back-patch to v14 where tab-completion for COPY and \copy options |within WITH clauses was first supported. | |Author: Atsushi Torikoshi |Reviewed-by: Yugo Nagata |Discussion: https://postgr.es/m/079e7a2c801f252ae8d522b772790ed7@oss.nttdata.com |Backpatch-through: 14 |--- | src/bin/psql/tab-complete.c | 24 +++++++++++++++++++----- | 1 file changed, 19 insertions(+), 5 deletions(-) | |diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c |index 5b909d6f3a0..7e36cb11973 100644 |--- a/src/bin/psql/tab-complete.c |+++ b/src/bin/psql/tab-complete.c -------------------------- No file to patch. Skipping patch. 2 out of 2 hunks ignored === using 'git apply' to apply patch ./REL14_v4-0001-Fix-tab-completion-for-COPY-and-copy-options.patch === error: src/bin/psql/tab-complete.c: does not exist in index