=== Applying patches on top of PostgreSQL commit ID 07961ef86625be91e243f1dff8911cb1d70e443f ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Fri Nov  7 15:15:22 UTC 2025
On branch cf/6182
nothing to commit, working tree clean
=== using 'git am' to apply patch ./0001-MSVC-Improve-warning-options-set.patch ===
Applying: MSVC: Improve warning options set
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 MSVC: Improve warning options set
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
=== using patch(1) to apply patch ./0001-MSVC-Improve-warning-options-set.patch ===
patching file meson.build
Hunk #1 FAILED at 2147.
1 out of 1 hunk FAILED -- saving rejects to file meson.build.rej
Removing meson.build.rej
=== using 'git apply' to apply patch ./0001-MSVC-Improve-warning-options-set.patch ===
Applied patch to 'meson.build' with conflicts.
U meson.build
diff --cc meson.build
index 24aeffe929f,5ba7f2c8a24..00000000000
--- a/meson.build
+++ b/meson.build
@@@ -2150,6 -2150,7 +2150,10 @@@ if cc.get_id() == 'msvc
      # Warnings to disable:
      # from /W1:
      '/wd4090', # different 'modifier' qualifiers
++<<<<<<< ours
++=======
+     '/wd4273', # inconsistent DLL linkage
++>>>>>>> theirs
      # from /W2:
      '/wd4244', # conversion from 'type1' to 'type2', possible loss of data
      # from /W3: