=== Applying patches on top of PostgreSQL commit ID 9e17d25e79d4756be08b4a5521b4b58450217137 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sun Sep 20 15:01:31 UTC 2026
On branch cf/7302
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v2-0001-Optimize-MCV-statistics-for-sortable-types-by-lev.patch ===
Applying: Optimize MCV statistics for sortable types by leveraging sorted-order properties
Using index info to reconstruct a base tree...
M	src/backend/utils/adt/selfuncs.c
M	src/backend/utils/cache/lsyscache.c
M	src/include/utils/lsyscache.h
Falling back to patching base and 3-way merge...
Auto-merging src/include/utils/lsyscache.h
Auto-merging src/backend/utils/cache/lsyscache.c
Auto-merging src/backend/utils/adt/selfuncs.c
CONFLICT (content): Merge conflict in src/backend/utils/adt/selfuncs.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 Optimize MCV statistics for sortable types by leveraging sorted-order properties
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 ./v2-0001-Optimize-MCV-statistics-for-sortable-types-by-lev.patch ===
patching file src/backend/catalog/system_views.sql
patching file src/backend/commands/analyze.c
patching file src/backend/executor/nodeHash.c
patching file src/backend/statistics/stat_utils.c
patching file src/backend/utils/adt/like_support.c
patching file src/backend/utils/adt/network_selfuncs.c
patching file src/backend/utils/adt/selfuncs.c
Hunk #1 FAILED at 118.
Hunk #2 succeeded at 135 (offset -2 lines).
Hunk #3 succeeded at 155 (offset -2 lines).
Hunk #4 succeeded at 446 (offset -2 lines).
Hunk #5 succeeded at 460 (offset -2 lines).
Hunk #6 succeeded at 483 (offset -2 lines).
Hunk #7 succeeded at 683 (offset -2 lines).
Hunk #8 succeeded at 775 (offset -2 lines).
Hunk #9 succeeded at 796 (offset -2 lines).
Hunk #10 succeeded at 963 (offset -2 lines).
Hunk #11 succeeded at 1015 (offset -2 lines).
Hunk #12 succeeded at 1052 (offset -2 lines).
Hunk #13 succeeded at 1575 (offset -2 lines).
Hunk #14 succeeded at 1820 (offset -2 lines).
Hunk #15 succeeded at 2184 (offset -2 lines).
Hunk #16 succeeded at 2963 (offset -2 lines).
Hunk #17 succeeded at 2983 (offset -2 lines).
Hunk #18 succeeded at 2996 (offset -2 lines).
Hunk #19 succeeded at 3007 (offset -2 lines).
Hunk #20 succeeded at 4976 (offset -2 lines).
Hunk #21 succeeded at 4986 (offset -2 lines).
Hunk #22 succeeded at 7479 (offset -2 lines).
1 out of 22 hunks FAILED -- saving rejects to file src/backend/utils/adt/selfuncs.c.rej
patching file src/backend/utils/cache/lsyscache.c
patching file src/include/catalog/pg_statistic.h
patching file src/include/statistics/stat_utils.h
patching file src/include/utils/lsyscache.h
patching file src/include/utils/selfuncs.h
Unstaged changes after reset:
M	src/backend/catalog/system_views.sql
M	src/backend/commands/analyze.c
M	src/backend/executor/nodeHash.c
M	src/backend/statistics/stat_utils.c
M	src/backend/utils/adt/like_support.c
M	src/backend/utils/adt/network_selfuncs.c
M	src/backend/utils/adt/selfuncs.c
M	src/backend/utils/cache/lsyscache.c
M	src/include/catalog/pg_statistic.h
M	src/include/statistics/stat_utils.h
M	src/include/utils/lsyscache.h
M	src/include/utils/selfuncs.h
Removing src/backend/utils/adt/selfuncs.c.rej
=== using 'git apply' to apply patch ./v2-0001-Optimize-MCV-statistics-for-sortable-types-by-lev.patch ===
Applied patch to 'src/backend/catalog/system_views.sql' cleanly.
Applied patch to 'src/backend/commands/analyze.c' cleanly.
Applied patch to 'src/backend/executor/nodeHash.c' cleanly.
Applied patch to 'src/backend/statistics/stat_utils.c' cleanly.
Applied patch to 'src/backend/utils/adt/like_support.c' cleanly.
Applied patch to 'src/backend/utils/adt/network_selfuncs.c' cleanly.
Applied patch to 'src/backend/utils/adt/selfuncs.c' with conflicts.
Applied patch to 'src/backend/utils/cache/lsyscache.c' cleanly.
Applied patch to 'src/include/catalog/pg_statistic.h' cleanly.
Applied patch to 'src/include/statistics/stat_utils.h' cleanly.
Applied patch to 'src/include/utils/lsyscache.h' cleanly.
Applied patch to 'src/include/utils/selfuncs.h' cleanly.
U src/backend/utils/adt/selfuncs.c
diff --cc src/backend/utils/adt/selfuncs.c
index 5ee377595bd,0f51c69a4c1..00000000000
--- a/src/backend/utils/adt/selfuncs.c
+++ b/src/backend/utils/adt/selfuncs.c
@@@ -121,6 -123,8 +122,11 @@@
  #include "parser/parsetree.h"
  #include "rewrite/rewriteManip.h"
  #include "statistics/statistics.h"
++<<<<<<< ours
++=======
+ #include "statistics/stat_utils.h"
+ #include "storage/bufmgr.h"
++>>>>>>> theirs
  #include "utils/acl.h"
  #include "utils/array.h"
  #include "utils/builtins.h"