=== Applying patches on top of PostgreSQL commit ID c94409ebc3d7e9179d517736cbe9a948571f7c85 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Mon Jul 20 12:30:35 UTC 2026
On branch cf/6980
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v2-0001-Print-cancel-key-as-a-hex-string-in-trace.patch ===
Applying: Print cancel key as a hex string in trace
=== using 'git am' to apply patch ./v2-0002-Add-more-regress-masks-in-pqtrace.patch ===
Applying: Add more regress masks in pqtrace
=== using 'git am' to apply patch ./v2-0003-Make-pqtrace-write-line-atomically.patch ===
Applying: Make pqtrace write line atomically
=== using 'git am' to apply patch ./v2-0004-Add-PGTRACE-env-to-enable-protocol-tracing-in-lib.patch ===
Applying: Add PGTRACE env to enable protocol tracing in libpq
Using index info to reconstruct a base tree...
M	src/interfaces/libpq/fe-connect.c
Falling back to patching base and 3-way merge...
Auto-merging src/interfaces/libpq/fe-connect.c
CONFLICT (content): Merge conflict in src/interfaces/libpq/fe-connect.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 Add PGTRACE env to enable protocol tracing in libpq
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-0004-Add-PGTRACE-env-to-enable-protocol-tracing-in-lib.patch ===
patching file doc/src/sgml/libpq.sgml
patching file src/interfaces/libpq/fe-cancel.c
patching file src/interfaces/libpq/fe-connect.c
Hunk #2 FAILED at 1266.
Hunk #3 succeeded at 2071 (offset 5 lines).
Hunk #4 succeeded at 5095 (offset 5 lines).
Hunk #5 succeeded at 5217 (offset 5 lines).
1 out of 5 hunks FAILED -- saving rejects to file src/interfaces/libpq/fe-connect.c.rej
patching file src/interfaces/libpq/libpq-int.h
Unstaged changes after reset:
M	doc/src/sgml/libpq.sgml
M	src/interfaces/libpq/fe-cancel.c
M	src/interfaces/libpq/fe-connect.c
M	src/interfaces/libpq/libpq-int.h
Removing src/interfaces/libpq/fe-connect.c.rej
=== using 'git apply' to apply patch ./v2-0004-Add-PGTRACE-env-to-enable-protocol-tracing-in-lib.patch ===
Applied patch to 'doc/src/sgml/libpq.sgml' cleanly.
Applied patch to 'src/interfaces/libpq/fe-cancel.c' cleanly.
Applied patch to 'src/interfaces/libpq/fe-connect.c' with conflicts.
Applied patch to 'src/interfaces/libpq/libpq-int.h' cleanly.
U src/interfaces/libpq/fe-connect.c
diff --cc src/interfaces/libpq/fe-connect.c
index 17c2288e9bc,4c1f8597ddf..00000000000
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@@ -1256,6 -1265,9 +1265,12 @@@ index_of_allowed_sasl_mech(PGconn *conn
  bool
  pqConnectOptions2(PGconn *conn)
  {
++<<<<<<< ours
++=======
+ 	int			i;
+ 	int			trace_flags = 0;
+ 
++>>>>>>> theirs
  	/*
  	 * Allocate memory for details about each host to which we might possibly
  	 * try to connect.  For that, count the number of elements in the hostaddr