=== Applying patches on top of PostgreSQL commit ID 1ae87df63ff693a91fbcb968850103a5a5d8cd96 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Mon Jul 13 13:47:26 UTC 2026
On branch cf/6782
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v8-0001-Fix-psql-duplicate-items-for-dRp-and-d.patch ===
Applying: Fix psql duplicate items for \dRp+ and \d
Using index info to reconstruct a base tree...
M	src/bin/psql/describe.c
M	src/test/regress/expected/publication.out
M	src/test/regress/sql/publication.sql
Falling back to patching base and 3-way merge...
Auto-merging src/bin/psql/describe.c
CONFLICT (content): Merge conflict in src/bin/psql/describe.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 Fix psql duplicate items for \dRp+ and \d
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-0001-Fix-psql-duplicate-items-for-dRp-and-d.patch ===
patching file src/bin/psql/describe.c
Hunk #1 FAILED at 3048.
Hunk #2 FAILED at 6793.
2 out of 2 hunks FAILED -- saving rejects to file src/bin/psql/describe.c.rej
patching file src/test/regress/expected/publication.out
Hunk #1 FAILED at 146.
Hunk #2 FAILED at 167.
Hunk #3 FAILED at 832.
3 out of 3 hunks FAILED -- saving rejects to file src/test/regress/expected/publication.out.rej
patching file src/test/regress/sql/publication.sql
Hunk #1 FAILED at 83.
Hunk #2 FAILED at 406.
2 out of 2 hunks FAILED -- saving rejects to file src/test/regress/sql/publication.sql.rej
Removing src/bin/psql/describe.c.rej
Removing src/test/regress/expected/publication.out.rej
Removing src/test/regress/sql/publication.sql.rej
=== using 'git apply' to apply patch ./v8-0001-Fix-psql-duplicate-items-for-dRp-and-d.patch ===
Applied patch to 'src/bin/psql/describe.c' with conflicts.
Applied patch to 'src/test/regress/expected/publication.out' cleanly.
Applied patch to 'src/test/regress/sql/publication.sql' cleanly.
U src/bin/psql/describe.c
diff --cc src/bin/psql/describe.c
index a2f09c26369,b9b9b1da8a4..00000000000
--- a/src/bin/psql/describe.c
+++ b/src/bin/psql/describe.c
@@@ -3050,10 -3050,11 +3050,18 @@@ describeOneTableDetails(const char *sch
  							  "     JOIN pg_catalog.pg_class c ON c.oid = pr.prrelid\n"
  							  "WHERE pr.prrelid = '%s'\n"
  
++<<<<<<< ours
 +			/*
 +			 * Don't print the same publication multiple times when the
 +			 * published table is also covered by a published schema.
 +			 */
++=======
+ 							  /*
+ 							   * Don't print the same publication multiple
+ 							   * times when the published table is also covered
+ 							   * by a published schema.
+ 							   */
++>>>>>>> theirs
  							  "  AND NOT EXISTS (\n"
  							  "     SELECT 1\n"
  							  "     FROM pg_catalog.pg_publication_namespace pn\n"
@@@ -6810,11 -6811,11 +6818,19 @@@ describePublications(const char *patter
  				 * schema.
  				 */
  				appendPQExpBuffer(&buf,
++<<<<<<< ours
 +								  "  AND NOT EXISTS (\n"
 +								  "     SELECT 1\n"
 +								  "     FROM pg_catalog.pg_publication_namespace pn\n"
 +								  "     WHERE pn.pnpubid = pr.prpubid\n"
 +								  "       AND pn.pnnspid = c.relnamespace)\n");
++=======
+ 							  "  AND NOT EXISTS (\n"
+ 							  "     SELECT 1\n"
+ 							  "     FROM pg_catalog.pg_publication_namespace pn\n"
+ 							  "     WHERE pn.pnpubid = pr.prpubid\n"
+ 							  "       AND pn.pnnspid = c.relnamespace)\n");
++>>>>>>> theirs
  			}
  
  			if (pset.sversion >= 190000)