=== Applying patches on top of PostgreSQL commit ID 3e4705484e0c64c7e90d5cc697a9aaf474287d0d ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Tue Oct 14 22:24:22 UTC 2025
On branch cf/5671
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v7-0001-meson-Add-postgresql-extension.pc-for-building-ex.patch ===
Applying: meson: Add postgresql-extension.pc for building extension libraries
=== using 'git am' to apply patch ./v7-0002-meson-Test-building-extensions-by-using-postgresq.patch ===
Applying: meson: Test building extensions by using postgresql-extension.pc
Using index info to reconstruct a base tree...
M	meson.build
M	src/test/modules/meson.build
Falling back to patching base and 3-way merge...
Auto-merging src/test/modules/meson.build
CONFLICT (content): Merge conflict in src/test/modules/meson.build
Auto-merging 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: Test building extensions by using postgresql-extension.pc
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	meson.build
M	src/test/modules/meson.build
Removing src/test/modules/test_meson_extensions/
Removing src/tools/ci/test_meson_extensions
=== using patch(1) to apply patch ./v7-0002-meson-Test-building-extensions-by-using-postgresq.patch ===
patching file src/test/modules/meson.build
Hunk #1 FAILED at 28.
1 out of 1 hunk FAILED -- saving rejects to file src/test/modules/meson.build.rej
patching file src/test/modules/test_meson_extensions/meson.build
patching file src/test/modules/test_meson_extensions/test_pkg_config_extensions/amcheck/meson.build
patching file src/test/modules/test_meson_extensions/test_pkg_config_extensions/auth_delay/meson.build
patching file src/test/modules/test_meson_extensions/test_pkg_config_extensions/meson.build
patching file src/test/modules/test_meson_extensions/test_pkg_config_extensions/postgres_fdw/meson.build
patching file meson.build
Hunk #1 succeeded at 3034 (offset -17 lines).
Hunk #2 succeeded at 3598 (offset -16 lines).
patching file src/tools/ci/test_meson_extensions
Unstaged changes after reset:
M	meson.build
Removing src/test/modules/meson.build.rej
Removing src/test/modules/test_meson_extensions/
Removing src/tools/ci/test_meson_extensions
=== using 'git apply' to apply patch ./v7-0002-meson-Test-building-extensions-by-using-postgresq.patch ===
Applied patch to 'src/test/modules/meson.build' with conflicts.
Falling back to direct application...
Falling back to direct application...
Falling back to direct application...
Falling back to direct application...
Falling back to direct application...
Applied patch to 'meson.build' cleanly.
Falling back to direct application...
U src/test/modules/meson.build
diff --cc src/test/modules/meson.build
index 14fc761c4cf,4e63da3abfe..00000000000
--- a/src/test/modules/meson.build
+++ b/src/test/modules/meson.build
@@@ -29,7 -28,7 +29,11 @@@ subdir('test_int128'
  subdir('test_integerset')
  subdir('test_json_parser')
  subdir('test_lfind')
++<<<<<<< ours
 +subdir('test_lwlock_tranches')
++=======
+ subdir('test_meson_extensions')
++>>>>>>> theirs
  subdir('test_misc')
  subdir('test_oat_hooks')
  subdir('test_parser')