=== Applying patches on top of PostgreSQL commit ID e18b0cb7344cb4bd28468f6c0aeeb9b9241d30aa ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Wed Jun 10 06:23:25 UTC 2026
On branch cf/5836
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v2-0001-Make-FOR-PORTION-OF-obey-SRF-protocol.patch ===
Applying: Make FOR PORTION OF obey SRF protocol
Using index info to reconstruct a base tree...
M	src/backend/executor/nodeModifyTable.c
Falling back to patching base and 3-way merge...
Auto-merging src/backend/executor/nodeModifyTable.c
CONFLICT (content): Merge conflict in src/backend/executor/nodeModifyTable.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 Make FOR PORTION OF obey SRF protocol
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-0001-Make-FOR-PORTION-OF-obey-SRF-protocol.patch ===
patching file src/backend/executor/nodeModifyTable.c
Hunk #1 FAILED at 65.
Hunk #2 FAILED at 1419.
Hunk #3 FAILED at 1514.
Hunk #4 FAILED at 1537.
4 out of 4 hunks FAILED -- saving rejects to file src/backend/executor/nodeModifyTable.c.rej
Removing src/backend/executor/nodeModifyTable.c.rej
=== using 'git apply' to apply patch ./v2-0001-Make-FOR-PORTION-OF-obey-SRF-protocol.patch ===
Applied patch to 'src/backend/executor/nodeModifyTable.c' with conflicts.
U src/backend/executor/nodeModifyTable.c
diff --cc src/backend/executor/nodeModifyTable.c
index 33a6735f08d,353a05cadff..00000000000
--- a/src/backend/executor/nodeModifyTable.c
+++ b/src/backend/executor/nodeModifyTable.c
@@@ -1518,9 -1542,9 +1518,15 @@@ ExecForPortionOfLeftovers(ModifyTableCo
  	{
  		Datum		leftover;
  
++<<<<<<< ours
 +		/* Call the function one time */
 +		pgstat_init_function_usage(fcinfo, &fcusage);
 +
++=======
+ 		pgstat_init_function_usage(fcinfo, &fcusage);
+ 
+ 		/* Call the function one time */
++>>>>>>> theirs
  		fcinfo->isnull = false;
  		rsi.isDone = ExprSingleResult;
  		leftover = FunctionCallInvoke(fcinfo);