=== 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 18:17:23 UTC 2026
On branch cf/5941
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v29-0001-error-safe-for-casting-text-to-other-types-per-pg_cast.patch ===
Applying: error safe for casting text to other types per pg_cast
Using index info to reconstruct a base tree...
M	src/backend/utils/adt/varlena.c
M	src/include/utils/varlena.h
Falling back to patching base and 3-way merge...
Auto-merging src/include/utils/varlena.h
CONFLICT (content): Merge conflict in src/include/utils/varlena.h
Auto-merging src/backend/utils/adt/varlena.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 error safe for casting text to other types per pg_cast
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 ./v29-0001-error-safe-for-casting-text-to-other-types-per-pg_cast.patch ===
patching file src/backend/catalog/namespace.c
patching file src/backend/utils/adt/regproc.c
patching file src/backend/utils/adt/varlena.c
patching file src/include/catalog/namespace.h
patching file src/include/utils/varlena.h
Hunk #1 FAILED at 27.
1 out of 1 hunk FAILED -- saving rejects to file src/include/utils/varlena.h.rej
Unstaged changes after reset:
M	src/backend/catalog/namespace.c
M	src/backend/utils/adt/regproc.c
M	src/backend/utils/adt/varlena.c
M	src/include/catalog/namespace.h
Removing src/include/utils/varlena.h.rej
=== using 'git apply' to apply patch ./v29-0001-error-safe-for-casting-text-to-other-types-per-pg_cast.patch ===
Applied patch to 'src/backend/catalog/namespace.c' cleanly.
Applied patch to 'src/backend/utils/adt/regproc.c' cleanly.
Applied patch to 'src/backend/utils/adt/varlena.c' cleanly.
Applied patch to 'src/include/catalog/namespace.h' cleanly.
Applied patch to 'src/include/utils/varlena.h' with conflicts.
U src/include/utils/varlena.h
diff --cc src/include/utils/varlena.h
index fe8d8a58952,5bc78aa02c0..00000000000
--- a/src/include/utils/varlena.h
+++ b/src/include/utils/varlena.h
@@@ -27,9 -27,7 +27,13 @@@ extern int	varstr_levenshtein_less_equa
  										  int ins_c, int del_c, int sub_c,
  										  int max_d, bool trusted);
  extern List *textToQualifiedNameList(text *textval);
++<<<<<<< ours
 +extern char *scan_quoted_identifier(char **endp, char **nextp);
 +extern char *scan_identifier(char **endp, char **nextp, char separator,
 +							 bool downcase_unquoted);
++=======
+ extern List *textToQualifiedNameListSafe(text *textval, Node *escontext);
++>>>>>>> theirs
  extern bool SplitIdentifierString(char *rawstring, char separator,
  								  List **namelist);
  extern bool SplitDirectoriesString(char *rawstring, char separator,