=== Applying patches on top of PostgreSQL commit ID 36f7330b8b2238c2093d7eac521f996b33e66121 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Mon Aug  3 13:06:32 UTC 2026
On branch cf/7076
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v2-0001-zic-fix-PostgreSQL-build-failure-on-filesystems-w.patch ===
Applying: zic: fix PostgreSQL build failure on filesystems without hard link support
Using index info to reconstruct a base tree...
M	src/port/win32link.c
Falling back to patching base and 3-way merge...
Auto-merging src/port/win32link.c
CONFLICT (content): Merge conflict in src/port/win32link.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 zic: fix PostgreSQL build failure on filesystems without hard link support
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 ./v2-0001-zic-fix-PostgreSQL-build-failure-on-filesystems-w.patch ===
patching file src/port/win32link.c
Hunk #1 FAILED at 23.
1 out of 1 hunk FAILED -- saving rejects to file src/port/win32link.c.rej
patching file src/timezone/zic.c
Unstaged changes after reset:
M	src/timezone/zic.c
Removing src/port/win32link.c.rej
=== using 'git apply' to apply patch ./v2-0001-zic-fix-PostgreSQL-build-failure-on-filesystems-w.patch ===
Applied patch to 'src/port/win32link.c' with conflicts.
Applied patch to 'src/timezone/zic.c' cleanly.
U src/port/win32link.c
diff --cc src/port/win32link.c
index 1acea199cb3,cf60f20f1b9..00000000000
--- a/src/port/win32link.c
+++ b/src/port/win32link.c
@@@ -23,20 -23,15 +23,32 @@@ link(const char *src, const char *dst
  	 */
  	if (CreateHardLinkA(dst, src, NULL) == 0)
  	{
++<<<<<<< ours
 +		/*
 +		 * CreateHardLinkA reports ERROR_INVALID_FUNCTION if the target file
 +		 * is on a filesystem that doesn't support hard links.  _dosmaperr
 +		 * would map that to EINVAL by default, but we want to report ENOTSUP
 +		 * because that will cause zic.c to fall back to making copies.
 +		 * However, EINVAL is probably the best translation in most cases, so
 +		 * tweak it here rather than changing _dosmaperr's behavior.
 +		 */
 +		DWORD		error = GetLastError();
 +
 +		if (error == ERROR_INVALID_FUNCTION)
 +			errno = ENOTSUP;
 +		else
 +			_dosmaperr(error);
++=======
+ 		DWORD errcode;
+ 
+ 		errcode = GetLastError();
+ 
+ 		if (errcode == ERROR_INVALID_FUNCTION)
+ 			errno = ENOTSUP;
+ 		else
+ 			_dosmaperr(errcode);
+ 
++>>>>>>> theirs
  		return -1;
  	}
  	else