=== Applying patches on top of PostgreSQL commit ID 665cafe8a4bd23b4f14194b0671d3ef09dc55864 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Fri Feb 21 15:49:22 UTC 2025
On branch cf/4956
nothing to commit, working tree clean
=== applying patch ./0001-Test-pg_dump-restore-of-regression-objects-20250211.patch
Applied patch to 'doc/src/sgml/regress.sgml' with conflicts.
Applied patch to 'src/bin/pg_upgrade/t/002_pg_upgrade.pl' cleanly.
Applied patch to 'src/test/perl/Makefile' cleanly.
Falling back to direct application...
Applied patch to 'src/test/perl/meson.build' cleanly.
U doc/src/sgml/regress.sgml
diff --cc doc/src/sgml/regress.sgml
index 0e5e8e8f30,3061ce42fd..0000000000
--- a/doc/src/sgml/regress.sgml
+++ b/doc/src/sgml/regress.sgml
@@@ -349,11 -349,13 +349,21 @@@ make check-world PG_TEST_EXTRA='kerbero
      </varlistentry>
  
      <varlistentry>
++<<<<<<< ours
 +     <term><literal>oauth</literal></term>
 +     <listitem>
 +      <para>
 +       Runs the test suite under <filename>src/test/modules/oauth_validator</filename>.
 +       This opens TCP/IP listen sockets for a test-server running HTTPS.
++=======
+      <term><literal>regress_dump_test</literal></term>
+      <listitem>
+       <para>
+        When enabled, <filename>src/bin/pg_upgrade/t/002_pg_upgrade.pl</filename>
+        tests dump and restore of regression database left behind by the
+        regression run. Not enabled by default because it is time and resource
+        consuming.
++>>>>>>> theirs
        </para>
       </listitem>
      </varlistentry>