=== Applying patches on top of PostgreSQL commit ID 04f9ea372a20c0346ad6d78de348543375761aaa ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Mon Apr 20 08:23:23 UTC 2026
On branch cf/6656
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v1-0001-Meson-Fix-todos-about-check_header-with-virtual-d.patch ===
Applying: Meson: Fix todos about check_header() with virtual declare_dependency()
Using index info to reconstruct a base tree...
M	meson.build
Falling back to patching base and 3-way merge...
Auto-merging meson.build
No changes -- Patch already applied.
=== using 'git am' to apply patch ./v1-0002-Meson-Fix-version-number-in-todo-comment-about-st.patch ===
Applying: Meson: Fix version number in todo comment about str.replace in
Using index info to reconstruct a base tree...
M	meson.build
Falling back to patching base and 3-way merge...
Auto-merging meson.build
CONFLICT (content): Merge conflict in meson.build
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Meson: Fix version number in todo comment about str.replace in
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 ./v1-0002-Meson-Fix-version-number-in-todo-comment-about-st.patch ===
patching file meson.build
Hunk #1 FAILED at 3669.
1 out of 1 hunk FAILED -- saving rejects to file meson.build.rej
Removing meson.build.rej
=== using 'git apply' to apply patch ./v1-0002-Meson-Fix-version-number-in-todo-comment-about-st.patch ===
Applied patch to 'meson.build' with conflicts.
U meson.build
diff --cc meson.build
index 20b887f1a1b,b17f4a3b086..00000000000
--- a/meson.build
+++ b/meson.build
@@@ -3747,7 -3669,7 +3747,11 @@@ endforeac
  # find and report conflicting files
  foreach build_path : potentially_conflicting_files
    build_path = host_system == 'windows' ? fs.as_posix(build_path) : build_path
++<<<<<<< ours
 +  # str.replace is in meson 0.58.0.
++=======
+   # str.replace is in meson 0.58
++>>>>>>> theirs
    src_path = meson.current_source_dir() / build_path.split(meson.current_build_dir() / '')[1]
    if fs.exists(src_path) or fs.is_symlink(src_path)
      conflicting_files += src_path