=== Applying patches on top of PostgreSQL commit ID 144ad723a4484927266a316d1c9550d56745ff67 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sun Jul  6 01:48:20 UTC 2025
On branch cf/5741
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v1-0001-Fix-connhost-type-during-non-blocking-cancellatio.patch ===
Applying: Fix connhost type during non-blocking cancellation
Using index info to reconstruct a base tree...
M	src/interfaces/libpq/fe-cancel.c
Falling back to patching base and 3-way merge...
Auto-merging src/interfaces/libpq/fe-cancel.c
CONFLICT (content): Merge conflict in src/interfaces/libpq/fe-cancel.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 Fix connhost type during non-blocking cancellation
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/interfaces/libpq/fe-cancel.c
=== using patch(1) to apply patch ./v1-0001-Fix-connhost-type-during-non-blocking-cancellatio.patch ===
patching file src/interfaces/libpq/fe-cancel.c
Hunk #1 FAILED at 137.
1 out of 1 hunk FAILED -- saving rejects to file src/interfaces/libpq/fe-cancel.c.rej
Removing src/interfaces/libpq/fe-cancel.c.rej
=== using 'git apply' to apply patch ./v1-0001-Fix-connhost-type-during-non-blocking-cancellatio.patch ===
Applied patch to 'src/interfaces/libpq/fe-cancel.c' with conflicts.
U src/interfaces/libpq/fe-cancel.c
diff --cc src/interfaces/libpq/fe-cancel.c
index 65517c5703b,9674d0a156b..00000000000
--- a/src/interfaces/libpq/fe-cancel.c
+++ b/src/interfaces/libpq/fe-cancel.c
@@@ -138,6 -138,7 +138,10 @@@ PQcancelCreate(PGconn *conn
  
  	originalHost = conn->connhost[conn->whichhost];
  	cancelConn->connhost[0].type = originalHost.type;
++<<<<<<< ours
++=======
+ 
++>>>>>>> theirs
  	if (originalHost.host)
  	{
  		cancelConn->connhost[0].host = strdup(originalHost.host);