=== Applying patches on top of PostgreSQL commit ID 23792d7381583d04c4bbd0a8507566401ec013d3 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sun Nov 16 14:43:21 UTC 2025
On branch cf/6181
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v1-0001-make-COPY.sgml-Parameters-linkable.patch ===
Applying: make COPY.sgml Parameters linkable
Using index info to reconstruct a base tree...
M	doc/src/sgml/ref/copy.sgml
Falling back to patching base and 3-way merge...
Auto-merging doc/src/sgml/ref/copy.sgml
CONFLICT (content): Merge conflict in doc/src/sgml/ref/copy.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 make COPY.sgml Parameters linkable
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/copy.sgml
=== using patch(1) to apply patch ./v1-0001-make-COPY.sgml-Parameters-linkable.patch ===
patching file doc/src/sgml/ref/copy.sgml
Hunk #1 FAILED at 105.
Hunk #2 FAILED at 114.
Hunk #3 FAILED at 125.
Hunk #4 FAILED at 149.
Hunk #5 FAILED at 161.
Hunk #6 FAILED at 180.
Hunk #7 FAILED at 189.
Hunk #8 FAILED at 198.
Hunk #9 FAILED at 212.
Hunk #10 FAILED at 221.
Hunk #11 FAILED at 235.
Hunk #12 FAILED at 258.
Hunk #13 FAILED at 271.
Hunk #14 FAILED at 295.
Hunk #15 FAILED at 308.
Hunk #16 FAILED at 335.
Hunk #17 FAILED at 347.
Hunk #18 FAILED at 361.
Hunk #19 FAILED at 375.
Hunk #20 FAILED at 390.
Hunk #21 FAILED at 405.
Hunk #22 FAILED at 433.
Hunk #23 FAILED at 451.
Hunk #24 FAILED at 463.
Hunk #25 FAILED at 481.
25 out of 25 hunks FAILED -- saving rejects to file doc/src/sgml/ref/copy.sgml.rej
Removing doc/src/sgml/ref/copy.sgml.rej
=== using 'git apply' to apply patch ./v1-0001-make-COPY.sgml-Parameters-linkable.patch ===
Applied patch to 'doc/src/sgml/ref/copy.sgml' with conflicts.
U doc/src/sgml/ref/copy.sgml
diff --cc doc/src/sgml/ref/copy.sgml
index 53b0ea8f573,27a2c418760..00000000000
--- a/doc/src/sgml/ref/copy.sgml
+++ b/doc/src/sgml/ref/copy.sgml
@@@ -105,7 -105,7 +105,11 @@@ COPY { <replaceable class="parameter">t
    <title>Parameters</title>
  
    <variablelist>
++<<<<<<< ours
 +   <varlistentry id="sql-copy-params-table-name">
++=======
+    <varlistentry id="sql-copy-table_name">
++>>>>>>> theirs
      <term><replaceable class="parameter">table_name</replaceable></term>
      <listitem>
       <para>
@@@ -114,7 -114,7 +118,11 @@@
      </listitem>
     </varlistentry>
  
++<<<<<<< ours
 +   <varlistentry id="sql-copy-params-column-name">
++=======
+    <varlistentry id="sql-copy-column_name">
++>>>>>>> theirs
      <term><replaceable class="parameter">column_name</replaceable></term>
       <listitem>
       <para>
@@@ -125,7 -125,7 +133,11 @@@
      </listitem>
     </varlistentry>
  
++<<<<<<< ours
 +   <varlistentry id="sql-copy-params-query">
++=======
+    <varlistentry id="sql-copy-query">
++>>>>>>> theirs
      <term><replaceable class="parameter">query</replaceable></term>
      <listitem>
       <para>
@@@ -149,7 -149,7 +161,11 @@@
      </listitem>
     </varlistentry>
  
++<<<<<<< ours
 +   <varlistentry id="sql-copy-params-filename">
++=======
+    <varlistentry id="sql-copy-filename">
++>>>>>>> theirs
      <term><replaceable class="parameter">filename</replaceable></term>
      <listitem>
       <para>
@@@ -161,7 -161,7 +177,11 @@@
      </listitem>
     </varlistentry>
  
++<<<<<<< ours
 +   <varlistentry id="sql-copy-params-program">
++=======
+    <varlistentry id="sql-copy-PROGRAM">
++>>>>>>> theirs
      <term><literal>PROGRAM</literal></term>
      <listitem>
       <para>
@@@ -180,7 -180,7 +200,11 @@@
      </listitem>
     </varlistentry>
  
++<<<<<<< ours
 +   <varlistentry id="sql-copy-params-stdin">
++=======
+    <varlistentry id="sql-copy-STDIN">
++>>>>>>> theirs
      <term><literal>STDIN</literal></term>
      <listitem>
       <para>
@@@ -189,7 -189,7 +213,11 @@@
      </listitem>
     </varlistentry>
  
++<<<<<<< ours
 +   <varlistentry id="sql-copy-params-stdout">
++=======
+    <varlistentry id="sql-copy-STDOUT">
++>>>>>>> theirs
      <term><literal>STDOUT</literal></term>
      <listitem>
       <para>
@@@ -198,7 -198,7 +226,11 @@@
      </listitem>
     </varlistentry>
  
++<<<<<<< ours
 +   <varlistentry id="sql-copy-params-boolean">
++=======
+    <varlistentry id="sql-copy-boolean">
++>>>>>>> theirs
      <term><replaceable class="parameter">boolean</replaceable></term>
      <listitem>
       <para>
@@@ -212,7 -212,7 +244,11 @@@
      </listitem>
     </varlistentry>
  
++<<<<<<< ours
 +   <varlistentry id="sql-copy-params-integer">
++=======
+    <varlistentry id="sql-copy-integer">
++>>>>>>> theirs
      <term><replaceable class="parameter">integer</replaceable></term>
      <listitem>
       <para>
@@@ -221,7 -221,7 +257,11 @@@
      </listitem>
     </varlistentry>
  
++<<<<<<< ours
 +   <varlistentry id="sql-copy-params-format">
++=======
+    <varlistentry id="sql-copy-FORMAT">
++>>>>>>> theirs
      <term><literal>FORMAT</literal></term>
      <listitem>
       <para>
@@@ -235,7 -235,7 +275,11 @@@
      </listitem>
     </varlistentry>
  
++<<<<<<< ours
 +   <varlistentry id="sql-copy-params-freeze">
++=======
+    <varlistentry id="sql-copy-FREEZE">
++>>>>>>> theirs
      <term><literal>FREEZE</literal></term>
      <listitem>
       <para>
@@@ -258,7 -258,7 +302,11 @@@
      </listitem>
     </varlistentry>
  
++<<<<<<< ours
 +   <varlistentry id="sql-copy-params-delimiter">
++=======
+    <varlistentry id="sql-copy-DELIMITER">
++>>>>>>> theirs
      <term><literal>DELIMITER</literal></term>
      <listitem>
       <para>
@@@ -271,7 -271,7 +319,11 @@@
      </listitem>
     </varlistentry>
  
++<<<<<<< ours
 +   <varlistentry id="sql-copy-params-null">
++=======
+    <varlistentry id="sql-copy-NULL">
++>>>>>>> theirs
      <term><literal>NULL</literal></term>
      <listitem>
       <para>
@@@ -295,7 -295,7 +347,11 @@@
      </listitem>
     </varlistentry>
  
++<<<<<<< ours
 +   <varlistentry id="sql-copy-params-default">
++=======
+    <varlistentry id="sql-copy-DEFAULT">
++>>>>>>> theirs
      <term><literal>DEFAULT</literal></term>
      <listitem>
       <para>
@@@ -308,7 -308,7 +364,11 @@@
      </listitem>
     </varlistentry>
  
++<<<<<<< ours
 +   <varlistentry id="sql-copy-params-header">
++=======
+    <varlistentry id="sql-copy-HEADER">
++>>>>>>> theirs
      <term><literal>HEADER</literal></term>
      <listitem>
       <para>
@@@ -335,7 -335,7 +395,11 @@@
      </listitem>
     </varlistentry>
  
++<<<<<<< ours
 +   <varlistentry id="sql-copy-params-quote">
++=======
+    <varlistentry id="sql-copy-QUOTE">
++>>>>>>> theirs
      <term><literal>QUOTE</literal></term>
      <listitem>
       <para>
@@@ -347,7 -347,7 +411,11 @@@
      </listitem>
     </varlistentry>
  
++<<<<<<< ours
 +   <varlistentry id="sql-copy-params-escape">
++=======
+    <varlistentry id="sql-copy-ESCAPE">
++>>>>>>> theirs
      <term><literal>ESCAPE</literal></term>
      <listitem>
       <para>
@@@ -361,7 -361,7 +429,11 @@@
      </listitem>
     </varlistentry>
  
++<<<<<<< ours
 +   <varlistentry id="sql-copy-params-force-quote">
++=======
+    <varlistentry id="sql-copy-FORCE_QUOTE">
++>>>>>>> theirs
      <term><literal>FORCE_QUOTE</literal></term>
      <listitem>
       <para>
@@@ -375,7 -375,7 +447,11 @@@
      </listitem>
     </varlistentry>
  
++<<<<<<< ours
 +   <varlistentry id="sql-copy-params-force-not-null">
++=======
+    <varlistentry id="sql-copy-FORCE_NOT_NULL">
++>>>>>>> theirs
      <term><literal>FORCE_NOT_NULL</literal></term>
      <listitem>
       <para>
@@@ -390,7 -390,7 +466,11 @@@
      </listitem>
     </varlistentry>
  
++<<<<<<< ours
 +   <varlistentry id="sql-copy-params-force-null">
++=======
+    <varlistentry id="sql-copy-FORCE_NULL">
++>>>>>>> theirs
      <term><literal>FORCE_NULL</literal></term>
      <listitem>
       <para>
@@@ -405,7 -405,7 +485,11 @@@
      </listitem>
     </varlistentry>
  
++<<<<<<< ours
 +   <varlistentry id="sql-copy-params-on-error">
++=======
+    <varlistentry id="sql-copy-ON_ERROR">
++>>>>>>> theirs
      <term><literal>ON_ERROR</literal></term>
      <listitem>
       <para>
@@@ -433,7 -433,7 +517,11 @@@
      </listitem>
     </varlistentry>
  
++<<<<<<< ours
 +   <varlistentry id="sql-copy-params-reject-limit">
++=======
+    <varlistentry id="sql-copy-REJECT_LIMIT">
++>>>>>>> theirs
      <term><literal>REJECT_LIMIT</literal></term>
      <listitem>
       <para>
@@@ -451,7 -451,7 +539,11 @@@
      </listitem>
     </varlistentry>
  
++<<<<<<< ours
 +   <varlistentry id="sql-copy-params-encoding">
++=======
+    <varlistentry id="sql-copy-ENCODING">
++>>>>>>> theirs
      <term><literal>ENCODING</literal></term>
      <listitem>
       <para>
@@@ -463,7 -463,7 +555,11 @@@
      </listitem>
     </varlistentry>
  
++<<<<<<< ours
 +   <varlistentry id="sql-copy-params-log-verbosity">
++=======
+    <varlistentry id="sql-copy-LOG_VERBOSITY">
++>>>>>>> theirs
      <term><literal>LOG_VERBOSITY</literal></term>
      <listitem>
       <para>
@@@ -481,7 -481,7 +577,11 @@@
      </listitem>
     </varlistentry>
  
++<<<<<<< ours
 +   <varlistentry id="sql-copy-params-where">
++=======
+    <varlistentry id="sql-copy-WHERE">
++>>>>>>> theirs
      <term><literal>WHERE</literal></term>
      <listitem>
     <para>