=== Applying patches on top of PostgreSQL commit ID a9afa021e95f2b0ffaaf26f3a27e685f634f4ac9 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Mon Feb  2 07:56:27 UTC 2026
On branch cf/6197
nothing to commit, working tree clean
=== using 'git am' to apply patch ./0001-ci-Test-legacy-Windows-build-in-REL_16_STABLE.patch ===
Applying: ci: Test legacy Windows build in REL_16_STABLE.
=== using 'git am' to apply patch ./0002-Fix-Mkvcbuild.pm-builds-of-test_cloexec.c.patch ===
Applying: Fix Mkvcbuild.pm builds of test_cloexec.c.
Using index info to reconstruct a base tree...
M	src/test/modules/test_cloexec/Makefile
Falling back to patching base and 3-way merge...
Auto-merging src/test/modules/test_cloexec/Makefile
CONFLICT (content): Merge conflict in src/test/modules/test_cloexec/Makefile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix Mkvcbuild.pm builds of test_cloexec.c.
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/test/modules/test_cloexec/Makefile
=== using patch(1) to apply patch ./0002-Fix-Mkvcbuild.pm-builds-of-test_cloexec.c.patch ===
patching file src/test/modules/test_cloexec/Makefile
Hunk #1 FAILED at 3.
1 out of 1 hunk FAILED -- saving rejects to file src/test/modules/test_cloexec/Makefile.rej
Removing src/test/modules/test_cloexec/Makefile.rej
=== using 'git apply' to apply patch ./0002-Fix-Mkvcbuild.pm-builds-of-test_cloexec.c.patch ===
Applied patch to 'src/test/modules/test_cloexec/Makefile' with conflicts.
U src/test/modules/test_cloexec/Makefile
diff --cc src/test/modules/test_cloexec/Makefile
index db3876f21e4,4f0ed58714e..00000000000
--- a/src/test/modules/test_cloexec/Makefile
+++ b/src/test/modules/test_cloexec/Makefile
@@@ -5,6 -5,7 +5,10 @@@ PGAPPICON = win3
  
  PROGRAM = test_cloexec
  OBJS = $(WIN32RES) test_cloexec.o
++<<<<<<< ours
++=======
+ PG_LIBS_INTERNAL = $(libpq_pgport)
++>>>>>>> theirs
  
  NO_INSTALLCHECK = 1
  TAP_TESTS = 1