=== Applying patches on top of PostgreSQL commit ID 49b82522f13fa5f756687f5609f687877fc970ff ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sun Mar 30 19:42:22 UTC 2025
On branch cf/5647
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v2-0001-Synopsis-improvements-for-server-applications.patch ===
Applying: Synopsis improvements for server applications
Using index info to reconstruct a base tree...
M	doc/src/sgml/ref/initdb.sgml
M	doc/src/sgml/ref/pg_createsubscriber.sgml
M	doc/src/sgml/ref/pg_rewind.sgml
M	doc/src/sgml/ref/pgupgrade.sgml
Falling back to patching base and 3-way merge...
Auto-merging doc/src/sgml/ref/pgupgrade.sgml
Auto-merging doc/src/sgml/ref/pg_rewind.sgml
Auto-merging doc/src/sgml/ref/pg_createsubscriber.sgml
CONFLICT (content): Merge conflict in doc/src/sgml/ref/pg_createsubscriber.sgml
Auto-merging doc/src/sgml/ref/initdb.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 Synopsis improvements for server applications
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".
Unstaged changes after reset:
M	doc/src/sgml/docguide.sgml
M	doc/src/sgml/ref/initdb.sgml
M	doc/src/sgml/ref/pg_checksums.sgml
M	doc/src/sgml/ref/pg_controldata.sgml
M	doc/src/sgml/ref/pg_createsubscriber.sgml
M	doc/src/sgml/ref/pg_resetwal.sgml
M	doc/src/sgml/ref/pg_rewind.sgml
M	doc/src/sgml/ref/pg_waldump.sgml
M	doc/src/sgml/ref/pg_walsummary.sgml
M	doc/src/sgml/ref/pgupgrade.sgml
=== using patch(1) to apply patch ./v2-0001-Synopsis-improvements-for-server-applications.patch ===
patch: unrecognized option `--no-backup-if-mismatch'
usage: patch [-bCcEeflNnRstuv] [-B backup-prefix] [-D symbol] [-d directory]
             [-F max-fuzz] [-i patchfile] [-o out-file] [-p strip-count]
             [-r rej-name] [-V t | nil | never | none] [-x number]
             [-z backup-ext] [--posix] [origfile [patchfile]]
       patch <patchfile
=== using 'git apply' to apply patch ./v2-0001-Synopsis-improvements-for-server-applications.patch ===
Applied patch to 'doc/src/sgml/docguide.sgml' cleanly.
Applied patch to 'doc/src/sgml/ref/initdb.sgml' cleanly.
Applied patch to 'doc/src/sgml/ref/pg_checksums.sgml' cleanly.
Applied patch to 'doc/src/sgml/ref/pg_controldata.sgml' cleanly.
Applied patch to 'doc/src/sgml/ref/pg_createsubscriber.sgml' with conflicts.
Applied patch to 'doc/src/sgml/ref/pg_resetwal.sgml' cleanly.
Applied patch to 'doc/src/sgml/ref/pg_rewind.sgml' cleanly.
Applied patch to 'doc/src/sgml/ref/pg_waldump.sgml' cleanly.
Applied patch to 'doc/src/sgml/ref/pg_walsummary.sgml' cleanly.
Applied patch to 'doc/src/sgml/ref/pgupgrade.sgml' cleanly.
U doc/src/sgml/ref/pg_createsubscriber.sgml
diff --cc doc/src/sgml/ref/pg_createsubscriber.sgml
index 1f0ddd7f9f2,430c04ea6ca..00000000000
--- a/doc/src/sgml/ref/pg_createsubscriber.sgml
+++ b/doc/src/sgml/ref/pg_createsubscriber.sgml
@@@ -88,19 -74,12 +74,28 @@@ PostgreSQL documentatio
  
     <variablelist>
      <varlistentry>
++<<<<<<< ours
 +     <term><option>-a</option></term>
 +     <term><option>--all</option></term>
 +     <listitem>
 +      <para>
 +       Create one subscription per database on the target server. Exceptions
 +       are template databases and databases that don't allow connections.
 +       If the database name is not specified in publisher-server, the postgres
 +       database will be used, or if that does not exist, template1 will be used.
 +       Automatically generated names for subscriptions, publications, and
 +       replication slots are used when this option is specified.
 +       This option cannot be used along with <option>--database</option>,
 +       <option>--publication</option>, <option>--replication-slot</option>, or
 +       <option>--subscription</option>.
++=======
+      <term><option>-D <replaceable class="parameter">datadir</replaceable></option></term>
+      <term><option>--pgdata=<replaceable class="parameter">datadir</replaceable></option></term>
+      <listitem>
+       <para>
+        The target directory that contains a cluster directory from a physical
+        replica.
++>>>>>>> theirs
        </para>
       </listitem>
      </varlistentry>