=== Applying patches on top of PostgreSQL commit ID e76defbcf09e22941d8cea462e2deef36d43fa04 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Mon Nov 17 07:44:21 UTC 2025
On branch cf/6160
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v2-0001-ci-Improve-OpenBSD-core-dump-backtrace-handling.patch ===
Applying: ci: Improve OpenBSD core dump backtrace handling
Using index info to reconstruct a base tree...
M	.cirrus.tasks.yml
M	src/tools/ci/cores_backtrace.sh
Falling back to patching base and 3-way merge...
Auto-merging src/tools/ci/cores_backtrace.sh
CONFLICT (content): Merge conflict in src/tools/ci/cores_backtrace.sh
Auto-merging .cirrus.tasks.yml
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: Improve OpenBSD core dump backtrace handling
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".
Unstaged changes after reset:
M	src/tools/ci/cores_backtrace.sh
=== using patch(1) to apply patch ./v2-0001-ci-Improve-OpenBSD-core-dump-backtrace-handling.patch ===
patching file .cirrus.tasks.yml
Hunk #1 FAILED at 322.
Hunk #2 FAILED at 388.
2 out of 2 hunks FAILED -- saving rejects to file .cirrus.tasks.yml.rej
patching file src/tools/ci/cores_backtrace.sh
Hunk #1 FAILED at 1.
Hunk #2 succeeded at 27 with fuzz 2 (offset 10 lines).
Hunk #3 FAILED at 30.
2 out of 3 hunks FAILED -- saving rejects to file src/tools/ci/cores_backtrace.sh.rej
Unstaged changes after reset:
M	src/tools/ci/cores_backtrace.sh
Removing .cirrus.tasks.yml.rej
Removing src/tools/ci/cores_backtrace.sh.rej
=== using 'git apply' to apply patch ./v2-0001-ci-Improve-OpenBSD-core-dump-backtrace-handling.patch ===
Applied patch to '.cirrus.tasks.yml' cleanly.
Applied patch to 'src/tools/ci/cores_backtrace.sh' with conflicts.
U src/tools/ci/cores_backtrace.sh
diff --cc src/tools/ci/cores_backtrace.sh
index cb325f21156,d0de7720790..00000000000
--- a/src/tools/ci/cores_backtrace.sh
+++ b/src/tools/ci/cores_backtrace.sh
@@@ -46,7 -46,7 +46,11 @@@ for corefile in $(find "$directory" -ty
          binary=$(which "${base}")
  
          if [ -z "$binary" ]; then
++<<<<<<< ours
 +            echo "executable ${base} not found in ${PATH}, running 'lldb' without debug information"
++=======
+             echo "${base} executable cannot be found in ${executable_directory}, running 'lldb' without the ${base} executable"
++>>>>>>> theirs
              lldb -c "$corefile" --batch -o 'thread backtrace all' -o 'quit'
          else
              lldb "$binary" -c "$corefile" --batch -o 'thread backtrace all' -o 'quit'