=== Applying patches on top of PostgreSQL commit ID 5173bfd0443e0c0f3fa37006727d516dc1ba4cee ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sat Oct 25 06:06:20 UTC 2025
On branch cf/5847
nothing to commit, working tree clean
=== using 'git am' to apply patch ./doc-reorder-entities-and-comment.diff ===
Patch format detection failed.
=== using patch(1) to apply patch ./doc-reorder-entities-and-comment.diff ===
patching file doc/src/sgml/docguide.sgml
Hunk #1 succeeded at 68 (offset -2 lines).
patching file doc/src/sgml/filelist.sgml
Hunk #2 succeeded at 62 (offset 3 lines).
Hunk #3 FAILED at 166.
Hunk #4 succeeded at 181 (offset 4 lines).
Hunk #5 FAILED at 186.
2 out of 5 hunks FAILED -- saving rejects to file doc/src/sgml/filelist.sgml.rej
patching file doc/src/sgml/postgres.sgml
patching file doc/src/sgml/ref/allfiles.sgml
patching file doc/src/sgml/reference.sgml
Unstaged changes after reset:
M	doc/src/sgml/docguide.sgml
M	doc/src/sgml/filelist.sgml
M	doc/src/sgml/postgres.sgml
M	doc/src/sgml/ref/allfiles.sgml
M	doc/src/sgml/reference.sgml
Removing doc/src/sgml/filelist.sgml.rej
=== using 'git apply' to apply patch ./doc-reorder-entities-and-comment.diff ===
Applied patch to 'doc/src/sgml/docguide.sgml' cleanly.
Applied patch to 'doc/src/sgml/filelist.sgml' with conflicts.
Applied patch to 'doc/src/sgml/postgres.sgml' cleanly.
Applied patch to 'doc/src/sgml/ref/allfiles.sgml' cleanly.
Applied patch to 'doc/src/sgml/reference.sgml' cleanly.
U doc/src/sgml/filelist.sgml
diff --cc doc/src/sgml/filelist.sgml
index ac66fcbdb57,4f92942964c..00000000000
--- a/doc/src/sgml/filelist.sgml
+++ b/doc/src/sgml/filelist.sgml
@@@ -147,8 -166,7 +169,12 @@@
  <!ENTITY pgbuffercache   SYSTEM "pgbuffercache.sgml">
  <!ENTITY pgcrypto        SYSTEM "pgcrypto.sgml">
  <!ENTITY pgfreespacemap  SYSTEM "pgfreespacemap.sgml">
++<<<<<<< ours
 +<!ENTITY pglogicalinspect  SYSTEM "pglogicalinspect.sgml">
 +<!ENTITY pgoverexplain   SYSTEM "pgoverexplain.sgml">
++=======
+ <!ENTITY pglogicalinspect SYSTEM "pglogicalinspect.sgml">
++>>>>>>> theirs
  <!ENTITY pgprewarm       SYSTEM "pgprewarm.sgml">
  <!ENTITY pgrowlocks      SYSTEM "pgrowlocks.sgml">
  <!ENTITY pgstatstatements SYSTEM "pgstatstatements.sgml">
@@@ -178,24 -197,20 +205,20 @@@
  <!ENTITY datetime   SYSTEM "datetime.sgml">
  <!ENTITY docguide   SYSTEM "docguide.sgml">
  <!ENTITY errcodes   SYSTEM "errcodes.sgml">
+ <!ENTITY errcodes-table SYSTEM "errcodes-table.sgml">
  <!ENTITY features   SYSTEM "features.sgml">
+ <!ENTITY features-supported   SYSTEM "features-supported.sgml">
+ <!ENTITY features-unsupported SYSTEM "features-unsupported.sgml">
+ <!ENTITY glossary   SYSTEM "glossary.sgml">
  <!ENTITY keywords   SYSTEM "keywords.sgml">
+ <!ENTITY keywords-table SYSTEM "keywords-table.sgml">
+ <!ENTITY limits     SYSTEM "limits.sgml">
  <!ENTITY sourcerepo SYSTEM "sourcerepo.sgml">
  
+ <!-- release notes -->
  <!ENTITY release    SYSTEM "release.sgml">
 -<!ENTITY release-18 SYSTEM "release-18.sgml">
 +<!ENTITY release-19 SYSTEM "release-19.sgml">
  
- <!ENTITY limits     SYSTEM "limits.sgml">
- <!ENTITY acronyms   SYSTEM "acronyms.sgml">
- <!ENTITY glossary   SYSTEM "glossary.sgml">
- <!ENTITY color      SYSTEM "color.sgml">
- 
- <!ENTITY features-supported   SYSTEM "features-supported.sgml">
- <!ENTITY features-unsupported SYSTEM "features-unsupported.sgml">
- 
- <!ENTITY errcodes-table SYSTEM "errcodes-table.sgml">
- <!ENTITY keywords-table SYSTEM "keywords-table.sgml">
- 
  <!-- back matter -->
  <!ENTITY biblio     SYSTEM "biblio.sgml">