=== Applying patches on top of PostgreSQL commit ID 53a49365052026907afff7613929710d1e7f0da0 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Fri Jan 31 20:28:23 UTC 2025
On branch cf/4635
nothing to commit, working tree clean
=== applying patch ./v16-0001-btree-Implement-dynamic-prefix-truncation.patch
/work/patches/./v16-0001-btree-Implement-dynamic-prefix-truncation.patch:458: trailing whitespace.
		 * _bt_compare calls due to potential concurrent page splits. 
Applied patch to 'contrib/amcheck/verify_nbtree.c' cleanly.
Applied patch to 'src/backend/access/nbtree/README' cleanly.
Applied patch to 'src/backend/access/nbtree/nbtinsert.c' cleanly.
Applied patch to 'src/backend/access/nbtree/nbtsearch.c' cleanly.
Applied patch to 'src/include/access/nbtree.h' with conflicts.
U src/include/access/nbtree.h
warning: 1 line adds whitespace errors.
diff --cc src/include/access/nbtree.h
index 6a501537e1,95a5b46b3e..0000000000
--- a/src/include/access/nbtree.h
+++ b/src/include/access/nbtree.h
@@@ -1275,8 -1272,10 +1275,15 @@@ extern void _bt_preprocess_keys(IndexSc
   */
  extern BTStack _bt_search(Relation rel, Relation heaprel, BTScanInsert key,
  						  Buffer *bufP, int access);
++<<<<<<< ours
 +extern OffsetNumber _bt_binsrch_insert(Relation rel, BTInsertState insertstate);
 +extern int32 _bt_compare(Relation rel, BTScanInsert key, Page page, OffsetNumber offnum);
++=======
+ extern OffsetNumber _bt_binsrch_insert(Relation rel, BTInsertState insertstate,
+ 									   int highkeyprefix);
+ extern int32 _bt_compare(Relation rel, BTScanInsert key, Page page,
+ 						 OffsetNumber offnum, int *sprefix);
++>>>>>>> theirs
  extern bool _bt_first(IndexScanDesc scan, ScanDirection dir);
  extern bool _bt_next(IndexScanDesc scan, ScanDirection dir);
  extern Buffer _bt_get_endpoint(Relation rel, uint32 level, bool rightmost);