=== Applying patches on top of PostgreSQL commit ID 6b48f5d1a74168c78badfb2e59ef788bb8eb396e ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Fri May 15 05:11:22 UTC 2026
On branch cf/6713
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v1-0001-pgbench-fix-verbose-error-message-corruption-with.patch ===
Applying: pgbench: fix verbose error message corruption with multiple threads
Using index info to reconstruct a base tree...
M	src/bin/pgbench/pgbench.c
Falling back to patching base and 3-way merge...
Auto-merging src/bin/pgbench/pgbench.c
CONFLICT (content): Merge conflict in src/bin/pgbench/pgbench.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 pgbench: fix verbose error message corruption with multiple threads
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 ./v1-0001-pgbench-fix-verbose-error-message-corruption-with.patch ===
patching file src/bin/pgbench/pgbench.c
Hunk #1 FAILED at 3630.
Hunk #2 FAILED at 3654.
2 out of 2 hunks FAILED -- saving rejects to file src/bin/pgbench/pgbench.c.rej
Removing src/bin/pgbench/pgbench.c.rej
=== using 'git apply' to apply patch ./v1-0001-pgbench-fix-verbose-error-message-corruption-with.patch ===
Applied patch to 'src/bin/pgbench/pgbench.c' with conflicts.
U src/bin/pgbench/pgbench.c
diff --cc src/bin/pgbench/pgbench.c
index 0b2bb9340b5,45e6cfed70a..00000000000
--- a/src/bin/pgbench/pgbench.c
+++ b/src/bin/pgbench/pgbench.c
@@@ -3636,8 -3636,8 +3636,13 @@@ printVerboseErrorMessages(CState *st, p
  
  	printfPQExpBuffer(&buf, "client %d ", st->id);
  	appendPQExpBufferStr(&buf, (is_retry ?
++<<<<<<< ours
 +								"repeats the transaction after the error" :
 +								"ends the failed transaction"));
++=======
+ 							   "repeats the transaction after the error" :
+ 							   "ends the failed transaction"));
++>>>>>>> theirs
  	appendPQExpBuffer(&buf, " (try %u", st->tries);
  
  	/* Print max_tries if it is not unlimited. */
@@@ -3655,9 -3655,9 +3660,15 @@@
  						  (100.0 * (*now - st->txn_scheduled) / latency_limit));
  	}
  	appendPQExpBufferStr(&buf, ")\n");
++<<<<<<< ours
 +
 +	pg_log_info("%s", buf.data);
 +
++=======
+ 
+ 	pg_log_info("%s", buf.data);
+ 
++>>>>>>> theirs
  	termPQExpBuffer(&buf);
  }