=== Applying patches on top of PostgreSQL commit ID 9b917a93116e6b8aac7ed837ded27696f7232505 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Thu Aug  6 09:27:31 UTC 2026
On branch cf/4105
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v5-0001-rebased-changed-no-functions-flag-id-from-18-to-19.patch ===
Applying: rebased, changed --no-functions flag id from 18 to 19
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 rebased, changed --no-functions flag id from 18 to 19
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 ./v5-0001-rebased-changed-no-functions-flag-id-from-18-to-19.patch ===
patching file doc/src/sgml/ref/pgbench.sgml
patching file src/bin/pgbench/pgbench.c
Hunk #5 succeeded at 4868 (offset -1 lines).
Hunk #6 succeeded at 4943 (offset -1 lines).
Hunk #7 succeeded at 5527 (offset -4 lines).
Hunk #8 FAILED at 6374.
Hunk #9 succeeded at 6936 (offset -7 lines).
Hunk #10 succeeded at 6944 (offset -7 lines).
Hunk #11 succeeded at 7298 (offset -4 lines).
Hunk #12 succeeded at 7399 (offset -4 lines).
1 out of 12 hunks FAILED -- saving rejects to file src/bin/pgbench/pgbench.c.rej
Unstaged changes after reset:
M	doc/src/sgml/ref/pgbench.sgml
M	src/bin/pgbench/pgbench.c
Removing src/bin/pgbench/pgbench.c.rej
=== using 'git apply' to apply patch ./v5-0001-rebased-changed-no-functions-flag-id-from-18-to-19.patch ===
Applied patch to 'doc/src/sgml/ref/pgbench.sgml' cleanly.
Applied patch to 'src/bin/pgbench/pgbench.c' with conflicts.
U src/bin/pgbench/pgbench.c
diff --cc src/bin/pgbench/pgbench.c
index 5862758427f,64bfe9fefea..00000000000
--- a/src/bin/pgbench/pgbench.c
+++ b/src/bin/pgbench/pgbench.c
@@@ -6202,9 -6370,11 +6366,14 @@@ process_builtin(const BuiltinScript *bi
  static void
  listAvailableScripts(void)
  {
 -	int			i;
 -
  	fprintf(stderr, "Available builtin scripts:\n");
++<<<<<<< ours
 +	for (size_t i = 0; i < lengthof(builtin_script); i++)
 +		fprintf(stderr, "  %13s: %s\n", builtin_script[i].name, builtin_script[i].desc);
++=======
+ 	for (i = 0; i < lengthof(builtin_script); i++)
+ 		fprintf(stderr, "  %21s: %s\n", builtin_script[i].name, builtin_script[i].desc);
++>>>>>>> theirs
  	fprintf(stderr, "\n");
  }