=== Applying patches on top of PostgreSQL commit ID b0496e30830b7cee6d17485404dd4c51d7aea286 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Thu Nov 12 16:32:37 UTC 2026 On branch cf/7630 nothing to commit, working tree clean === using 'git am' to apply patch ./v2-0001-Doc-standardise-cleartext-and-plain-text-terms.patch === Applying: Doc: standardise cleartext and plain text terms Using index info to reconstruct a base tree... M doc/src/sgml/catalogs.sgml M doc/src/sgml/config.sgml M doc/src/sgml/ref/pg_dump.sgml Falling back to patching base and 3-way merge... Auto-merging doc/src/sgml/ref/pg_dump.sgml CONFLICT (content): Merge conflict in doc/src/sgml/ref/pg_dump.sgml Auto-merging doc/src/sgml/config.sgml Auto-merging doc/src/sgml/catalogs.sgml error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 Doc: standardise cleartext and plain text terms 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-Doc-standardise-cleartext-and-plain-text-terms.patch === patching file doc/src/sgml/catalogs.sgml Hunk #1 succeeded at 8049 (offset 19 lines). patching file doc/src/sgml/client-auth.sgml patching file doc/src/sgml/config.sgml patching file doc/src/sgml/dblink.sgml patching file doc/src/sgml/docguide.sgml patching file doc/src/sgml/func/func-trigger.sgml patching file doc/src/sgml/glossary.sgml patching file doc/src/sgml/libpq.sgml patching file doc/src/sgml/maintenance.sgml patching file doc/src/sgml/passwordcheck.sgml patching file doc/src/sgml/pgcrypto.sgml patching file doc/src/sgml/postgres-fdw.sgml patching file doc/src/sgml/protocol.sgml patching file doc/src/sgml/ref/pg_dump.sgml Hunk #4 FAILED at 1237. Hunk #5 succeeded at 1739 (offset -2 lines). 1 out of 5 hunks FAILED -- saving rejects to file doc/src/sgml/ref/pg_dump.sgml.rej patching file doc/src/sgml/ref/pg_restore.sgml patching file doc/src/sgml/ref/psql-ref.sgml Unstaged changes after reset: M doc/src/sgml/catalogs.sgml M doc/src/sgml/client-auth.sgml M doc/src/sgml/config.sgml M doc/src/sgml/dblink.sgml M doc/src/sgml/docguide.sgml M doc/src/sgml/func/func-trigger.sgml M doc/src/sgml/glossary.sgml M doc/src/sgml/libpq.sgml M doc/src/sgml/maintenance.sgml M doc/src/sgml/passwordcheck.sgml M doc/src/sgml/pgcrypto.sgml M doc/src/sgml/postgres-fdw.sgml M doc/src/sgml/protocol.sgml M doc/src/sgml/ref/pg_dump.sgml M doc/src/sgml/ref/pg_restore.sgml M doc/src/sgml/ref/psql-ref.sgml Removing doc/src/sgml/ref/pg_dump.sgml.rej === using 'git apply' to apply patch ./v2-0001-Doc-standardise-cleartext-and-plain-text-terms.patch === Applied patch to 'doc/src/sgml/catalogs.sgml' cleanly. Applied patch to 'doc/src/sgml/client-auth.sgml' cleanly. Applied patch to 'doc/src/sgml/config.sgml' cleanly. Applied patch to 'doc/src/sgml/dblink.sgml' cleanly. Applied patch to 'doc/src/sgml/docguide.sgml' cleanly. Applied patch to 'doc/src/sgml/func/func-trigger.sgml' cleanly. Applied patch to 'doc/src/sgml/glossary.sgml' cleanly. Applied patch to 'doc/src/sgml/libpq.sgml' cleanly. Applied patch to 'doc/src/sgml/maintenance.sgml' cleanly. Applied patch to 'doc/src/sgml/passwordcheck.sgml' cleanly. Applied patch to 'doc/src/sgml/pgcrypto.sgml' cleanly. Applied patch to 'doc/src/sgml/postgres-fdw.sgml' cleanly. Applied patch to 'doc/src/sgml/protocol.sgml' cleanly. Applied patch to 'doc/src/sgml/ref/pg_dump.sgml' with conflicts. Applied patch to 'doc/src/sgml/ref/pg_restore.sgml' cleanly. Applied patch to 'doc/src/sgml/ref/psql-ref.sgml' cleanly. U doc/src/sgml/ref/pg_dump.sgml diff --cc doc/src/sgml/ref/pg_dump.sgml index 3c97facb657,75e76f676c1..00000000000 --- a/doc/src/sgml/ref/pg_dump.sgml +++ b/doc/src/sgml/ref/pg_dump.sgml @@@ -1235,8 -1236,10 +1236,15 @@@ PostgreSQL documentatio Use the provided string as the psql ++<<<<<<< ours + \restrict key in the dump output. If no restrict + key is specified, ++======= + \restrict key in the dump output. This can only be + specified for plain text dumps, i.e., when is + set to plain or the option + is omitted. If no restrict key is specified, ++>>>>>>> theirs pg_dump will generate a random one as needed. Keys may contain only alphanumeric characters.