=== 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 11:08:25 UTC 2026
On branch cf/6454
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v6-0001-Use-correct-collation-for-lowercasing.patch ===
Applying: Use correct collation for lowercasing
=== using 'git am' to apply patch ./v6-0002-Use-correct-collation-for-finding-word-boundaries.patch ===
Applying: Use correct collation for finding word boundaries
error: sha1 information is lacking or useless (contrib/pg_trgm/trgm_op.c).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Use correct collation for finding word boundaries
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 ./v6-0002-Use-correct-collation-for-finding-word-boundaries.patch ===
patching file contrib/pg_trgm/expected/pg_trgm_collation.out
patching file contrib/pg_trgm/sql/pg_trgm_collation.sql
patching file contrib/pg_trgm/trgm.h
patching file contrib/pg_trgm/trgm_op.c
Hunk #1 succeeded at 335 (offset 43 lines).
Hunk #2 succeeded at 344 (offset 43 lines).
Hunk #3 succeeded at 357 (offset 43 lines).
Hunk #4 succeeded at 533 (offset 43 lines).
Hunk #5 succeeded at 950 (offset 43 lines).
Hunk #6 succeeded at 973 (offset 43 lines).
Hunk #7 succeeded at 984 (offset 43 lines).
Hunk #8 succeeded at 1022 (offset 43 lines).
Hunk #9 succeeded at 1049 (offset 43 lines).
Hunk #10 succeeded at 1113 (offset 43 lines).
patching file contrib/pg_trgm/trgm_regexp.c
patching file src/backend/tsearch/ts_locale.c
patching file src/include/tsearch/ts_locale.h
Hunk #2 FAILED at 57.
1 out of 2 hunks FAILED -- saving rejects to file src/include/tsearch/ts_locale.h.rej
Unstaged changes after reset:
M	contrib/pg_trgm/expected/pg_trgm_collation.out
M	contrib/pg_trgm/sql/pg_trgm_collation.sql
M	contrib/pg_trgm/trgm.h
M	contrib/pg_trgm/trgm_op.c
M	contrib/pg_trgm/trgm_regexp.c
M	src/backend/tsearch/ts_locale.c
M	src/include/tsearch/ts_locale.h
Removing src/include/tsearch/ts_locale.h.rej
=== using 'git apply' to apply patch ./v6-0002-Use-correct-collation-for-finding-word-boundaries.patch ===
Applied patch to 'contrib/pg_trgm/expected/pg_trgm_collation.out' cleanly.
/work/patches/./v6-0002-Use-correct-collation-for-finding-word-boundaries.patch:54: new blank line at EOF.
+
Applied patch to 'contrib/pg_trgm/sql/pg_trgm_collation.sql' cleanly.
Applied patch to 'contrib/pg_trgm/trgm.h' cleanly.
error: repository lacks the necessary blob to perform 3-way merge.
Falling back to direct application...
error: repository lacks the necessary blob to perform 3-way merge.
Falling back to direct application...
Applied patch to 'src/backend/tsearch/ts_locale.c' cleanly.
Applied patch to 'src/include/tsearch/ts_locale.h' with conflicts.
U src/include/tsearch/ts_locale.h
warning: 1 line adds whitespace errors.
diff --cc src/include/tsearch/ts_locale.h
index f4edf300c2b,7ad7042d523..00000000000
--- a/src/include/tsearch/ts_locale.h
+++ b/src/include/tsearch/ts_locale.h
@@@ -56,7 -57,7 +57,11 @@@ ts_copychar_cstr(void *dest, const voi
  #define COPYCHAR ts_copychar_cstr
  
  #define GENERATE_T_ISCLASS_DECL(character_class) \
++<<<<<<< ours
 +extern int	t_is##character_class##_with_len(const char *ptr, int mblen); \
++=======
+ extern int	t_is##character_class##_with_len_collation(const char *ptr, int len, Oid collation); \
++>>>>>>> theirs
  extern int	t_is##character_class##_cstr(const char *ptr); \
  extern int	t_is##character_class##_unbounded(const char *ptr); \
  \