=== Applying patches on top of PostgreSQL commit ID dd50eb9145eead17ebd62db2e43a6de7c53102c0 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Wed Jul 29 02:59:30 UTC 2026
On branch cf/6989
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v1-0001-Replace-of-strncpy-on-xactdesc.c.patch ===
Applying: Replace of strncpy on xactdesc.c
Using index info to reconstruct a base tree...
M	src/backend/access/rmgrdesc/xactdesc.c
Falling back to patching base and 3-way merge...
Auto-merging src/backend/access/rmgrdesc/xactdesc.c
CONFLICT (content): Merge conflict in src/backend/access/rmgrdesc/xactdesc.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 Replace of strncpy on xactdesc.c
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-Replace-of-strncpy-on-xactdesc.c.patch ===
patching file src/backend/access/rmgrdesc/xactdesc.c
Hunk #1 FAILED at 256.
1 out of 1 hunk FAILED -- saving rejects to file src/backend/access/rmgrdesc/xactdesc.c.rej
Removing src/backend/access/rmgrdesc/xactdesc.c.rej
=== using 'git apply' to apply patch ./v1-0001-Replace-of-strncpy-on-xactdesc.c.patch ===
Applied patch to 'src/backend/access/rmgrdesc/xactdesc.c' with conflicts.
U src/backend/access/rmgrdesc/xactdesc.c
diff --cc src/backend/access/rmgrdesc/xactdesc.c
index 96aa6e17bd5,0f466a4c27c..00000000000
--- a/src/backend/access/rmgrdesc/xactdesc.c
+++ b/src/backend/access/rmgrdesc/xactdesc.c
@@@ -256,7 -256,7 +256,11 @@@ ParsePrepareRecord(uint8 info, xl_xact_
  	parsed->nabortstats = xlrec->nabortstats;
  	parsed->nmsgs = xlrec->ninvalmsgs;
  
++<<<<<<< ours
 +	strlcpy(parsed->twophase_gid, bufptr, GIDSIZE);
++=======
+ 	strlcpy(parsed->twophase_gid, bufptr, sizeof(parsed->twophase_gid));
++>>>>>>> theirs
  	bufptr += MAXALIGN(xlrec->gidlen);
  
  	parsed->subxacts = (TransactionId *) bufptr;