=== Applying patches on top of PostgreSQL commit ID 4adb0380b9bff5ec6424a9e87f76f8974b025367 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Fri Sep 12 21:53:21 UTC 2025
On branch cf/6048
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v2-0001-Display-more-fields-of-xl_hash-wal-records.patch ===
Applying: Display more fields of xl_hash* wal records
Using index info to reconstruct a base tree...
M	src/backend/access/rmgrdesc/hashdesc.c
Falling back to patching base and 3-way merge...
Auto-merging src/backend/access/rmgrdesc/hashdesc.c
CONFLICT (content): Merge conflict in src/backend/access/rmgrdesc/hashdesc.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 Display more fields of xl_hash* wal records
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/access/rmgrdesc/hashdesc.c
=== using patch(1) to apply patch ./v2-0001-Display-more-fields-of-xl_hash-wal-records.patch ===
patching file src/backend/access/rmgrdesc/hashdesc.c
Hunk #1 FAILED at 28.
Hunk #2 FAILED at 58.
Hunk #3 FAILED at 85.
3 out of 3 hunks FAILED -- saving rejects to file src/backend/access/rmgrdesc/hashdesc.c.rej
Removing src/backend/access/rmgrdesc/hashdesc.c.rej
=== using 'git apply' to apply patch ./v2-0001-Display-more-fields-of-xl_hash-wal-records.patch ===
Applied patch to 'src/backend/access/rmgrdesc/hashdesc.c' with conflicts.
U src/backend/access/rmgrdesc/hashdesc.c
diff --cc src/backend/access/rmgrdesc/hashdesc.c
index 2ee5332452f,2ea90b15d62..00000000000
--- a/src/backend/access/rmgrdesc/hashdesc.c
+++ b/src/backend/access/rmgrdesc/hashdesc.c
@@@ -29,9 -29,7 +29,13 @@@ hash_desc(StringInfo buf, XLogReaderSta
  				xl_hash_init_meta_page *xlrec = (xl_hash_init_meta_page *) rec;
  
  				appendStringInfo(buf, "num_tuples %g, procid %u, fillfactor %d",
++<<<<<<< ours
 +								 xlrec->num_tuples,
 +								 xlrec->procid,
 +								 xlrec->ffactor);
++=======
+ 								 xlrec->num_tuples, xlrec->procid, xlrec->ffactor);
++>>>>>>> theirs
  				break;
  			}
  		case XLOG_HASH_INIT_BITMAP_PAGE:
@@@ -62,8 -60,7 +66,12 @@@
  
  				appendStringInfo(buf, "new_bucket %u, old_bucket_flag %u, new_bucket_flag %u, meta_page_masks_updated %c, issplitpoint_changed %c",
  								 xlrec->new_bucket,
++<<<<<<< ours
 +								 xlrec->old_bucket_flag,
 +								 xlrec->new_bucket_flag,
++=======
+ 								 xlrec->old_bucket_flag, xlrec->new_bucket_flag,
++>>>>>>> theirs
  								 (xlrec->flags & XLH_SPLIT_META_UPDATE_MASKS) ? 'T' : 'F',
  								 (xlrec->flags & XLH_SPLIT_META_UPDATE_SPLITPOINT) ? 'T' : 'F');
  				break;