=== Applying patches on top of PostgreSQL commit ID 0ab208fa505c04e2b3483de53a73edb71f9b9106 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Fri Nov 7 14:14:20 UTC 2025 On branch cf/5524 nothing to commit, working tree clean === using 'git am' to apply patch ./v8-0001-add-function-argument-name-to-function-substr.patch === Applying: add function argument name to function substr === using 'git am' to apply patch ./v8-0002-add-function-argument-name-to-function-substring.patch === Applying: add function argument name to function substring error: sha1 information is lacking or useless (doc/src/sgml/func/func-binarystring.sgml). error: could not build fake ancestor hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 add function argument name to function substring 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 ./v8-0002-add-function-argument-name-to-function-substring.patch === patching file doc/src/sgml/func/func-binarystring.sgml patching file doc/src/sgml/func/func-bitstring.sgml patching file doc/src/sgml/func/func-matching.sgml Hunk #4 FAILED at 606. 1 out of 4 hunks FAILED -- saving rejects to file doc/src/sgml/func/func-matching.sgml.rej patching file doc/src/sgml/func/func-string.sgml patching file src/backend/catalog/system_functions.sql patching file src/include/catalog/pg_proc.dat Unstaged changes after reset: M doc/src/sgml/func/func-binarystring.sgml M doc/src/sgml/func/func-bitstring.sgml M doc/src/sgml/func/func-matching.sgml M doc/src/sgml/func/func-string.sgml M src/backend/catalog/system_functions.sql M src/include/catalog/pg_proc.dat Removing doc/src/sgml/func/func-matching.sgml.rej === using 'git apply' to apply patch ./v8-0002-add-function-argument-name-to-function-substring.patch === error: repository lacks the necessary blob to perform 3-way merge. Falling back to direct application... Applied patch to 'doc/src/sgml/func/func-bitstring.sgml' cleanly. Applied patch to 'doc/src/sgml/func/func-matching.sgml' with conflicts. error: repository lacks the necessary blob to perform 3-way merge. Falling back to direct application... Applied patch to 'src/backend/catalog/system_functions.sql' cleanly. error: repository lacks the necessary blob to perform 3-way merge. Falling back to direct application... U doc/src/sgml/func/func-matching.sgml diff --cc doc/src/sgml/func/func-matching.sgml index 91a0b7ca0de,ea4c2546f85..00000000000 --- a/doc/src/sgml/func/func-matching.sgml +++ b/doc/src/sgml/func/func-matching.sgml @@@ -600,8 -606,8 +606,13 @@@ substring(source Some examples: ++<<<<<<< ours +substring('foobar' FROM 'o.b') oob +substring('foobar' FROM 'o(.)b') o ++======= + substring(source=>'foobar', pattern=>'o.b') oob + substring('foobar' from 'o(.)b') o ++>>>>>>> theirs