=== Applying patches on top of PostgreSQL commit ID 85d5bd308bf5dc3068a4c28aa0f12cc22272f789 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Wed Dec 31 21:35:20 UTC 2025
On branch cf/4105
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v4-0001-added-new-and-old-style-SQL-functions-and-documen.patch ===
Applying: added-new-and-old-style-SQL-functions-and-documentation
Using index info to reconstruct a base tree...
M	doc/src/sgml/ref/pgbench.sgml
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
Auto-merging doc/src/sgml/ref/pgbench.sgml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 added-new-and-old-style-SQL-functions-and-documentation
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	doc/src/sgml/ref/pgbench.sgml
M	src/bin/pgbench/pgbench.c
=== using patch(1) to apply patch ./v4-0001-added-new-and-old-style-SQL-functions-and-documen.patch ===
patching file doc/src/sgml/ref/pgbench.sgml
Hunk #1 succeeded at 101 (offset -1 lines).
Hunk #2 succeeded at 192 (offset -1 lines).
Hunk #3 succeeded at 276 (offset -1 lines).
Hunk #4 succeeded at 376 (offset -1 lines).
Hunk #5 succeeded at 453 (offset -1 lines).
patching file src/bin/pgbench/pgbench.c
Hunk #2 succeeded at 804 (offset 8 lines).
Hunk #3 succeeded at 844 (offset 8 lines).
Hunk #4 succeeded at 979 (offset 8 lines).
Hunk #5 succeeded at 4869 (offset 51 lines).
Hunk #6 succeeded at 4944 (offset 51 lines).
Hunk #7 succeeded at 5531 (offset 51 lines).
Hunk #8 succeeded at 6374 (offset 51 lines).
Hunk #9 FAILED at 6882.
Hunk #10 succeeded at 6950 (offset 61 lines).
Hunk #11 succeeded at 7301 with fuzz 2 (offset 65 lines).
Hunk #12 succeeded at 7402 (offset 65 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 ./v4-0001-added-new-and-old-style-SQL-functions-and-documen.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 45b340d3da5,a3d951bce87..00000000000
--- a/src/bin/pgbench/pgbench.c
+++ b/src/bin/pgbench/pgbench.c
@@@ -6778,7 -6882,7 +6942,11 @@@ main(int argc, char **argv
  		{"verbose-errors", no_argument, NULL, 15},
  		{"exit-on-abort", no_argument, NULL, 16},
  		{"debug", no_argument, NULL, 17},
++<<<<<<< ours
 +		{"continue-on-error", no_argument, NULL, 18},
++=======
+ 		{"no-functions", no_argument, NULL, 18},
++>>>>>>> theirs
  		{NULL, 0, NULL, 0}
  	};
  
@@@ -7132,9 -7237,9 +7301,15 @@@
  			case 17:			/* debug */
  				pg_logging_increase_verbosity();
  				break;
++<<<<<<< ours
 +			case 18:			/* continue-on-error */
 +				benchmarking_option_set = true;
 +				continue_on_error = true;
++=======
+ 			case 18:				/* no-functions */
+ 				initialization_option_set = true;
+ 				no_functions = true;
++>>>>>>> theirs
  				break;
  			default:
  				/* getopt_long already emitted a complaint */