=== Applying patches on top of PostgreSQL commit ID 014f9a831a320666bf2195949f41710f970c54ad ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Fri Dec  5 18:25:22 UTC 2025
On branch cf/4817
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v7-0001-COPY-FROM-on_error-table.patch ===
Applying: COPY FROM (on_error table)
Using index info to reconstruct a base tree...
M	doc/src/sgml/datatype.sgml
M	doc/src/sgml/ref/copy.sgml
M	src/backend/commands/copy.c
M	src/backend/commands/copyfromparse.c
M	src/backend/parser/gram.y
Falling back to patching base and 3-way merge...
Auto-merging src/backend/parser/gram.y
Auto-merging src/backend/commands/copyfromparse.c
Auto-merging src/backend/commands/copy.c
Auto-merging doc/src/sgml/ref/copy.sgml
CONFLICT (content): Merge conflict in doc/src/sgml/ref/copy.sgml
Auto-merging doc/src/sgml/datatype.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 COPY FROM (on_error 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".
Unstaged changes after reset:
M	doc/src/sgml/datatype.sgml
M	doc/src/sgml/ref/copy.sgml
M	src/backend/catalog/system_functions.sql
M	src/backend/commands/copy.c
M	src/backend/commands/copyfrom.c
M	src/backend/commands/copyfromparse.c
M	src/backend/parser/gram.y
M	src/include/commands/copy.h
M	src/include/commands/copyfrom_internal.h
M	src/test/regress/expected/copy2.out
M	src/test/regress/sql/copy2.sql
=== using patch(1) to apply patch ./v7-0001-COPY-FROM-on_error-table.patch ===
patching file doc/src/sgml/datatype.sgml
patching file doc/src/sgml/ref/copy.sgml
Hunk #3 FAILED at 491.
1 out of 3 hunks FAILED -- saving rejects to file doc/src/sgml/ref/copy.sgml.rej
patching file src/backend/catalog/system_functions.sql
patching file src/backend/commands/copy.c
Hunk #1 succeeded at 456 (offset 39 lines).
Hunk #2 succeeded at 558 (offset 39 lines).
Hunk #3 succeeded at 734 (offset 39 lines).
Hunk #4 succeeded at 749 (offset 39 lines).
patching file src/backend/commands/copyfrom.c
patching file src/backend/commands/copyfromparse.c
patching file src/backend/parser/gram.y
Hunk #1 succeeded at 3646 (offset 21 lines).
patching file src/include/commands/copy.h
patching file src/include/commands/copyfrom_internal.h
patching file src/test/regress/expected/copy2.out
patching file src/test/regress/sql/copy2.sql
Unstaged changes after reset:
M	doc/src/sgml/datatype.sgml
M	doc/src/sgml/ref/copy.sgml
M	src/backend/catalog/system_functions.sql
M	src/backend/commands/copy.c
M	src/backend/commands/copyfrom.c
M	src/backend/commands/copyfromparse.c
M	src/backend/parser/gram.y
M	src/include/commands/copy.h
M	src/include/commands/copyfrom_internal.h
M	src/test/regress/expected/copy2.out
M	src/test/regress/sql/copy2.sql
Removing doc/src/sgml/ref/copy.sgml.rej
=== using 'git apply' to apply patch ./v7-0001-COPY-FROM-on_error-table.patch ===
Applied patch to 'doc/src/sgml/datatype.sgml' cleanly.
Applied patch to 'doc/src/sgml/ref/copy.sgml' with conflicts.
Applied patch to 'src/backend/catalog/system_functions.sql' cleanly.
Applied patch to 'src/backend/commands/copy.c' cleanly.
Applied patch to 'src/backend/commands/copyfrom.c' cleanly.
Applied patch to 'src/backend/commands/copyfromparse.c' cleanly.
Applied patch to 'src/backend/parser/gram.y' cleanly.
Applied patch to 'src/include/commands/copy.h' cleanly.
Applied patch to 'src/include/commands/copyfrom_internal.h' cleanly.
Applied patch to 'src/test/regress/expected/copy2.out' cleanly.
Applied patch to 'src/test/regress/sql/copy2.sql' cleanly.
U doc/src/sgml/ref/copy.sgml
diff --cc doc/src/sgml/ref/copy.sgml
index 53b0ea8f573,0215aac0771..00000000000
--- a/doc/src/sgml/ref/copy.sgml
+++ b/doc/src/sgml/ref/copy.sgml
@@@ -481,7 -491,23 +491,27 @@@ COPY { <replaceable class="parameter">t
      </listitem>
     </varlistentry>
  
++<<<<<<< ours
 +   <varlistentry id="sql-copy-params-where">
++=======
+    <varlistentry>
+     <term><literal>TABLE</literal></term>
+     <listitem>
+       <para>
+         Save error context details to the specified table: <replaceable class="parameter">error_saving_table</replaceable>.
+         This option is allowed only in <command>COPY FROM</command> and
+         <literal>ON_ERROR</literal> is specified with <literal>TABLE</literal>.
+         It also require the current <command>COPY FROM</command> user have <literal>INSERT</literal> privileges on all columns
+         of the <replaceable class="parameter">error_saving_table</replaceable>.
+         The <replaceable class="parameter">error_saving_table</replaceable> must
+         be a typed table derived from composite type <link
+         linkend="datatype-copy_error_saving"><command>copy_error_saving</command></link>.
+       </para>
+     </listitem>
+    </varlistentry>
+ 
+    <varlistentry>
++>>>>>>> theirs
      <term><literal>WHERE</literal></term>
      <listitem>
     <para>