=== Applying patches on top of PostgreSQL commit ID bf5206f007732c64f857e6bc214f77b5f31efc6a === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Wed Jun 10 02:54:23 UTC 2026 On branch cf/6148 nothing to commit, working tree clean === using 'git am' to apply patch ./v2-0001-CI-Add-task-that-runs-pgindent.patch === Applying: CI: Add task that runs pgindent Using index info to reconstruct a base tree... A .cirrus.star A .cirrus.tasks.yml Falling back to patching base and 3-way merge... CONFLICT (modify/delete): .cirrus.tasks.yml deleted in HEAD and modified in CI: Add task that runs pgindent. Version CI: Add task that runs pgindent of .cirrus.tasks.yml left in tree. CONFLICT (modify/delete): .cirrus.star deleted in HEAD and modified in CI: Add task that runs pgindent. Version CI: Add task that runs pgindent of .cirrus.star 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 CI: Add task that runs pgindent 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 ./v2-0001-CI-Add-task-that-runs-pgindent.patch === can't find file to patch at input line 32 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |From 46a42d19f243e2844907d231e3f0d8155cffaa31 Mon Sep 17 00:00:00 2001 |From: Jelte Fennema-Nio |Date: Mon, 20 Oct 2025 17:26:50 +0200 |Subject: [PATCH v2 1/2] CI: Add task that runs pgindent | |At PGConf.dev 2025 one thing that came up in the "Scaling PostgreSQL |Development" unconference session is that new hackers don't know all the |details of our development flow by heart yet. Of course it's documented |on the wiki, but even if they find the relevant wiki pages they often |still miss/forget things. One of the things they often forget is |formatting their code. The consensus at that session was that it was |probably worth adding a CI task for this to nudge newcomers to indent |their code. | |We're not too worried about this new requirement scaring away newcomers, |since autoformatting has become fairly commonplace in open source |development. Also committers can of course still choose to format the |patch themselves before committing if the formatting is failing. | |This might also help reduce the number of unindented commits that |committers push, which require a follow up "fix indent" commit to make |the koel buildfarm animal happy again. |--- | .cirrus.star | 1 + | .cirrus.tasks.yml | 37 +++++++++++++++++++++++++++++++++++++ | 2 files changed, 38 insertions(+) | |diff --git a/.cirrus.star b/.cirrus.star |index e9bb672b959..b1662850ed0 100644 |--- a/.cirrus.star |+++ b/.cirrus.star -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 44 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/.cirrus.tasks.yml b/.cirrus.tasks.yml |index eca9d62fc22..933426dd3b1 100644 |--- a/.cirrus.tasks.yml |+++ b/.cirrus.tasks.yml -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored === using 'git apply' to apply patch ./v2-0001-CI-Add-task-that-runs-pgindent.patch === error: .cirrus.star: does not exist in index error: .cirrus.tasks.yml: does not exist in index