=== Applying patches on top of PostgreSQL commit ID 89eafad297a9b01ad77cfc1ab93a433e0af894b0 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sun Jun  7 18:04:24 UTC 2026
On branch cf/6161
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v10-0001-Improve-docs-syntax-checking.patch ===
Applying: Improve docs syntax checking
Using index info to reconstruct a base tree...
A	.cirrus.tasks.yml
M	doc/src/sgml/meson.build
Falling back to patching base and 3-way merge...
Auto-merging doc/src/sgml/meson.build
CONFLICT (modify/delete): .cirrus.tasks.yml deleted in HEAD and modified in Improve docs syntax checking. Version Improve docs syntax checking of .cirrus.tasks.yml left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Improve docs syntax checking
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".
=== using patch(1) to apply patch ./v10-0001-Improve-docs-syntax-checking.patch ===
can't find file to patch at input line 35
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|From 4363b25ec38de2f098af4cf481e2a6016ed42aa4 Mon Sep 17 00:00:00 2001
|From: Nazir Bilal Yavuz <byavuz81@gmail.com>
|Date: Tue, 17 Feb 2026 13:43:07 +0300
|Subject: [PATCH v10] Improve docs syntax checking
|
|Move the checks out of the Makefile into a perl script that can be
|called from both the Makefile and meson.build. The set of files checked
|is simplified, so it is just all the sgml and xsl files found in
|docs/src/sgml directory tree.
|
|Along the way make some adjustments to .cirrus.tasks.yml to support this
|better in CI.
|
|Also ensure that the checks are run while generating the
|postgres-full.xml.
|
|Author: Nazir Bilal Yavuz <byavuz81@gmail.com>
|Co-Author: Andrew Dunstan <andrew@dunslane.net>
|Reviewed-by: Peter Eisentraut <peter@eisentraut.org>
|Reviewed-by: Andres Freund <andres@anarazel.de>
|Reviewed-by: Hayato Kuroda <kuroda.hayato@fujitsu.com>
|Discussion: https://postgr.es/m/CAN55FZ1qzoDcaKqsR3DwE%3DX6FL%2Bwpm%2B%3DKLvH6ahrRXNhjU53DQ%40mail.gmail.com
|---
| .cirrus.tasks.yml                 |   3 +
| doc/src/sgml/Makefile             |  16 +----
| doc/src/sgml/meson.build          |  36 ++++++++++-
| doc/src/sgml/sgml_syntax_check.pl | 102 ++++++++++++++++++++++++++++++
| 4 files changed, 141 insertions(+), 16 deletions(-)
| create mode 100755 doc/src/sgml/sgml_syntax_check.pl
|
|diff --git a/.cirrus.tasks.yml b/.cirrus.tasks.yml
|index 2a821593ce5..78f167656f8 100644
|--- a/.cirrus.tasks.yml
|+++ b/.cirrus.tasks.yml
--------------------------
No file to patch.  Skipping patch.
2 out of 2 hunks ignored
patching file doc/src/sgml/Makefile
patching file doc/src/sgml/meson.build
patching file doc/src/sgml/sgml_syntax_check.pl
Unstaged changes after reset:
M	doc/src/sgml/Makefile
M	doc/src/sgml/meson.build
Removing doc/src/sgml/sgml_syntax_check.pl
=== using 'git apply' to apply patch ./v10-0001-Improve-docs-syntax-checking.patch ===
error: .cirrus.tasks.yml: does not exist in index
Applied patch to 'doc/src/sgml/Makefile' cleanly.
Applied patch to 'doc/src/sgml/meson.build' cleanly.
Falling back to direct application...