=== Applying patches on top of PostgreSQL commit ID 451c43974f8e199097d97624a4952ad0973cea61 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Fri Jan  2 16:27:26 UTC 2026
On branch cf/4681
nothing to commit, working tree clean
=== using 'git am' to apply patch ./0001-Separate-format-specific-fields-from-CopyToStateData.patch ===
Applying: Separate format-specific fields from CopyToStateData struct.
Using index info to reconstruct a base tree...
M	src/backend/commands/copyto.c
M	src/include/commands/copy.h
M	src/include/commands/copyapi.h
Falling back to patching base and 3-way merge...
Auto-merging src/include/commands/copyapi.h
Auto-merging src/include/commands/copy.h
Auto-merging src/backend/commands/copyto.c
CONFLICT (content): Merge conflict in src/backend/commands/copyto.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 Separate format-specific fields from CopyToStateData struct.
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	src/backend/commands/copyto.c
M	src/include/commands/copy.h
M	src/include/commands/copyapi.h
Removing src/include/commands/copystate.h
=== using patch(1) to apply patch ./0001-Separate-format-specific-fields-from-CopyToStateData.patch ===
patching file src/backend/commands/copyto.c
Hunk #17 FAILED at 755.
1 out of 26 hunks FAILED -- saving rejects to file src/backend/commands/copyto.c.rej
patching file src/include/commands/copy.h
patching file src/include/commands/copyapi.h
patching file src/include/commands/copystate.h
Unstaged changes after reset:
M	src/backend/commands/copyto.c
M	src/include/commands/copy.h
M	src/include/commands/copyapi.h
Removing src/backend/commands/copyto.c.rej
Removing src/include/commands/copystate.h
=== using 'git apply' to apply patch ./0001-Separate-format-specific-fields-from-CopyToStateData.patch ===
Applied patch to 'src/backend/commands/copyto.c' with conflicts.
Applied patch to 'src/include/commands/copy.h' cleanly.
Applied patch to 'src/include/commands/copyapi.h' cleanly.
Falling back to direct application...
U src/backend/commands/copyto.c
diff --cc src/backend/commands/copyto.c
index 4ab4a3893d5,6a0a66507ba..00000000000
--- a/src/backend/commands/copyto.c
+++ b/src/backend/commands/copyto.c
@@@ -718,9 -755,7 +755,13 @@@ BeginCopyTo(ParseState *pstate
  							RelationGetRelationName(rel))));
  	}
  
++<<<<<<< ours
 +
 +	/* Allocate workspace and zero all fields */
 +	cstate = palloc0_object(CopyToStateData);
++=======
+ 	cstate = create_copyto_state(pstate, options);
++>>>>>>> theirs
  
  	/*
  	 * We allocate everything used by a cstate in a new memory context. This