=== Applying patches on top of PostgreSQL commit ID 901ed9b352b41f034e17bc540725082a488fce31 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sun May 10 14:50:24 UTC 2026
On branch cf/6217
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v9-0001-Detect-common-prefixes-during-radix-sort.patch ===
Applying: Detect common prefixes during radix sort
Using index info to reconstruct a base tree...
M	src/backend/utils/sort/tuplesort.c
Falling back to patching base and 3-way merge...
Auto-merging src/backend/utils/sort/tuplesort.c
CONFLICT (content): Merge conflict in src/backend/utils/sort/tuplesort.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 Detect common prefixes during radix sort
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 ./v9-0001-Detect-common-prefixes-during-radix-sort.patch ===
patching file src/backend/utils/sort/tuplesort.c
Hunk #1 FAILED at 104.
Hunk #2 FAILED at 2659.
Hunk #3 FAILED at 2747.
Hunk #4 FAILED at 2757.
Hunk #5 FAILED at 2770.
5 out of 5 hunks FAILED -- saving rejects to file src/backend/utils/sort/tuplesort.c.rej
Removing src/backend/utils/sort/tuplesort.c.rej
=== using 'git apply' to apply patch ./v9-0001-Detect-common-prefixes-during-radix-sort.patch ===
Applied patch to 'src/backend/utils/sort/tuplesort.c' with conflicts.
U src/backend/utils/sort/tuplesort.c
diff --cc src/backend/utils/sort/tuplesort.c
index c0e7527b9ca,72c2c2995d8..00000000000
--- a/src/backend/utils/sort/tuplesort.c
+++ b/src/backend/utils/sort/tuplesort.c
@@@ -2783,8 -2783,6 +2783,11 @@@ radix_sort_recursive(SortTuple *begin, 
  	else
  		next_level = level + 1;
  
++<<<<<<< ours
 +	Assert(next_level > level);
 +
++=======
++>>>>>>> theirs
  	for (uint8 *rp = remaining_partitions;
  		 rp < remaining_partitions + num_partitions;
  		 rp++)