=== Applying patches on top of PostgreSQL commit ID a27893df45ec5d8c657899202e9cf0b9a816fe2f === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Tue Jul 8 11:01:27 UTC 2025 On branch cf/5895 nothing to commit, working tree clean === using 'git am' to apply patch ./0001-doc-PG-18-relnotes-mention-of-pg_noreturn.patch === Applying: doc PG 18 relnotes: mention of pg_noreturn Using index info to reconstruct a base tree... A doc/src/sgml/release-18.sgml Falling back to patching base and 3-way merge... CONFLICT (modify/delete): doc/src/sgml/release-18.sgml deleted in HEAD and modified in doc PG 18 relnotes: mention of pg_noreturn. Version doc PG 18 relnotes: mention of pg_noreturn of doc/src/sgml/release-18.sgml 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 doc PG 18 relnotes: mention of pg_noreturn 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". Removing doc/src/sgml/release-18.sgml === using patch(1) to apply patch ./0001-doc-PG-18-relnotes-mention-of-pg_noreturn.patch === can't find file to patch at input line 14 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |From 52c479141457ab9d7fee1a5ac8b3184a35c5b497 Mon Sep 17 00:00:00 2001 |From: steve-chavez |Date: Tue, 1 Jul 2025 21:46:06 -0500 |Subject: [PATCH] doc PG 18 relnotes: mention of pg_noreturn | |--- | doc/src/sgml/release-18.sgml | 7 +++++++ | 1 file changed, 7 insertions(+) | |diff --git a/doc/src/sgml/release-18.sgml b/doc/src/sgml/release-18.sgml |index 9a6e4fb8d0e..43b4091cbdd 100644 |--- a/doc/src/sgml/release-18.sgml |+++ b/doc/src/sgml/release-18.sgml -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored === using 'git apply' to apply patch ./0001-doc-PG-18-relnotes-mention-of-pg_noreturn.patch === error: doc/src/sgml/release-18.sgml: does not exist in index