=== Applying patches on top of PostgreSQL commit ID d4c3a6b8ad830882066122081a7141ecd573f45d ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Fri Jan 31 20:16:27 UTC 2025
On branch cf/4735
nothing to commit, working tree clean
=== applying patch ./0001-Add-PGErrorVerbosity-to-typedefs.list.patch
Applied patch to 'src/include/utils/elog.h' cleanly.
Applied patch to 'src/tools/pgindent/typedefs.list' cleanly.
[cf/4735 fb0c7d8140] Add PGErrorVerbosity to typedefs.list
 Author: Jelte Fennema-Nio <jelte.fennema@microsoft.com>
 Date: Thu Mar 21 13:05:35 2024 +0100
 2 files changed, 2 insertions(+), 1 deletion(-)
=== applying patch ./0002-Allow-logging-backtraces-in-more-cases.patch
Applied patch to 'doc/src/sgml/config.sgml' with conflicts.
Applied patch to 'src/backend/utils/error/elog.c' cleanly.
Applied patch to 'src/backend/utils/misc/guc_tables.c' cleanly.
Applied patch to 'src/backend/utils/misc/postgresql.conf.sample' cleanly.
Applied patch to 'src/include/utils/elog.h' cleanly.
Applied patch to 'src/include/utils/guc.h' cleanly.
Applied patch to 'src/tools/pgindent/typedefs.list' cleanly.
U doc/src/sgml/config.sgml
diff --cc doc/src/sgml/config.sgml
index a782f10998,ff2222ef79..0000000000
--- a/doc/src/sgml/config.sgml
+++ b/doc/src/sgml/config.sgml
@@@ -11578,28 -11458,6 +11645,31 @@@ dynamic_library_path = 'C:\tools\postgr
        </listitem>
       </varlistentry>
  
++<<<<<<< ours
 +     <varlistentry id="guc-debug-copy-parse-plan-trees" xreflabel="debug_copy_parse_plan_trees">
 +      <term><varname>debug_copy_parse_plan_trees</varname> (<type>boolean</type>)
 +      <indexterm>
 +       <primary><varname>debug_copy_parse_plan_trees</varname> configuration parameter</primary>
 +      </indexterm>
 +      </term>
 +      <listitem>
 +       <para>
 +        Enabling this forces all parse and plan trees to be passed through
 +        <function>copyObject()</function>, to facilitate catching errors and
 +        omissions in <function>copyObject()</function>.  The default is off.
 +       </para>
 +
 +       <para>
 +        This parameter is only available when
 +        <symbol>DEBUG_NODE_TESTS_ENABLED</symbol> was defined at compile time
 +        (which happens automatically when using the
 +        <application>configure</application> option
 +        <option>--enable-cassert</option>).
 +       </para>
 +      </listitem>
 +     </varlistentry>
++=======
++>>>>>>> theirs
  
       <varlistentry id="guc-debug-discard-caches" xreflabel="debug_discard_caches">
        <term><varname>debug_discard_caches</varname> (<type>integer</type>)