=== Applying patches on top of PostgreSQL commit ID 972c14fb9134fdfd76ea6ebcf98a55a945bbc988 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Wed Apr 15 06:59:27 UTC 2026
On branch cf/5594
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v8-0001-psql-Listing-not-partition-tables-and-indexes.patch ===
Applying: psql: Listing "not-partition" tables and indexes
Using index info to reconstruct a base tree...
M	doc/src/sgml/ref/psql-ref.sgml
M	src/bin/psql/command.c
M	src/bin/psql/describe.c
M	src/bin/psql/help.c
M	src/bin/psql/tab-complete.in.c
Falling back to patching base and 3-way merge...
Auto-merging src/bin/psql/tab-complete.in.c
Auto-merging src/bin/psql/help.c
Auto-merging src/bin/psql/describe.c
CONFLICT (content): Merge conflict in src/bin/psql/describe.c
Auto-merging src/bin/psql/command.c
CONFLICT (content): Merge conflict in src/bin/psql/command.c
Auto-merging doc/src/sgml/ref/psql-ref.sgml
CONFLICT (content): Merge conflict in doc/src/sgml/ref/psql-ref.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 psql: Listing "not-partition" tables and indexes
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-psql-Listing-not-partition-tables-and-indexes.patch ===
patching file doc/src/sgml/ref/psql-ref.sgml
Hunk #1 succeeded at 1646 with fuzz 1 (offset 1 line).
Hunk #2 FAILED at 1653.
1 out of 2 hunks FAILED -- saving rejects to file doc/src/sgml/ref/psql-ref.sgml.rej
patching file src/bin/psql/command.c
Hunk #1 FAILED at 1190.
1 out of 1 hunk FAILED -- saving rejects to file src/bin/psql/command.c.rej
patching file src/bin/psql/describe.c
Hunk #1 succeeded at 4226 (offset 195 lines).
Hunk #2 FAILED at 4047.
Hunk #3 FAILED at 4055.
Hunk #4 succeeded at 4388 (offset 202 lines).
Hunk #5 succeeded at 4469 (offset 207 lines).
2 out of 5 hunks FAILED -- saving rejects to file src/bin/psql/describe.c.rej
patching file src/bin/psql/help.c
Hunk #1 succeeded at 252 (offset 1 line).
patching file src/bin/psql/tab-complete.in.c
Hunk #3 succeeded at 854 (offset 8 lines).
Hunk #4 succeeded at 1973 (offset 10 lines).
Hunk #5 succeeded at 5689 (offset 198 lines).
Hunk #6 succeeded at 5714 (offset 198 lines).
Hunk #7 succeeded at 5738 (offset 198 lines).
patching file src/test/regress/expected/psql.out
patching file src/test/regress/sql/psql.sql
Unstaged changes after reset:
M	doc/src/sgml/ref/psql-ref.sgml
M	src/bin/psql/describe.c
M	src/bin/psql/help.c
M	src/bin/psql/tab-complete.in.c
M	src/test/regress/expected/psql.out
M	src/test/regress/sql/psql.sql
Removing doc/src/sgml/ref/psql-ref.sgml.rej
Removing src/bin/psql/command.c.rej
Removing src/bin/psql/describe.c.rej
=== using 'git apply' to apply patch ./v8-0001-psql-Listing-not-partition-tables-and-indexes.patch ===
Applied patch to 'doc/src/sgml/ref/psql-ref.sgml' with conflicts.
Applied patch to 'src/bin/psql/command.c' with conflicts.
Applied patch to 'src/bin/psql/describe.c' with conflicts.
Applied patch to 'src/bin/psql/help.c' cleanly.
Applied patch to 'src/bin/psql/tab-complete.in.c' cleanly.
Applied patch to 'src/test/regress/expected/psql.out' cleanly.
Applied patch to 'src/test/regress/sql/psql.sql' cleanly.
U doc/src/sgml/ref/psql-ref.sgml
U src/bin/psql/command.c
U src/bin/psql/describe.c
diff --cc doc/src/sgml/ref/psql-ref.sgml
index 7c05afd4719,35cc058c952..00000000000
--- a/doc/src/sgml/ref/psql-ref.sgml
+++ b/doc/src/sgml/ref/psql-ref.sgml
@@@ -1643,19 -1643,19 +1643,27 @@@ SELECT $1 \parse stmt
  
        <varlistentry id="app-psql-meta-command-de">
          <term><literal>\dE[Sx+] [ <link linkend="app-psql-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
 +        <term><literal>\dG[Sx+] [ <link linkend="app-psql-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
          <term><literal>\di[Sx+] [ <link linkend="app-psql-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
          <term><literal>\dm[Sx+] [ <link linkend="app-psql-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
+         <term><literal>\dN[Sx+] [ <link linkend="app-psql-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
          <term><literal>\ds[Sx+] [ <link linkend="app-psql-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
          <term><literal>\dt[Sx+] [ <link linkend="app-psql-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
          <term><literal>\dv[Sx+] [ <link linkend="app-psql-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
  
          <listitem>
          <para>
++<<<<<<< ours
 +        In this group of commands, the letters <literal>E</literal>, <literal>G</literal>,
 +        <literal>i</literal>, <literal>m</literal>, <literal>s</literal>,
 +        <literal>t</literal>, and <literal>v</literal>
 +        stand for foreign table, index, property graph, materialized view,
++=======
+         In this group of commands, the letters <literal>E</literal>,
+         <literal>i</literal>, <literal>m</literal>, <literal>N</literal>,
+         <literal>s</literal>, <literal>t</literal>, and <literal>v</literal>
+         stand for foreign table, index, materialized view, no partitions,
++>>>>>>> theirs
          sequence, table, and view,
          respectively.
          You can specify any or all of
diff --cc src/bin/psql/command.c
index 493400f9090,bf5f61e5d3e..00000000000
--- a/src/bin/psql/command.c
+++ b/src/bin/psql/command.c
@@@ -1190,7 -1190,7 +1190,11 @@@ exec_command_d(PsqlScanState scan_state
  			case 'i':
  			case 's':
  			case 'E':
++<<<<<<< ours
 +			case 'G':
++=======
+ 			case 'N':
++>>>>>>> theirs
  				success = listTables(&cmd[1], pattern, show_verbose, show_system);
  				break;
  			case 'r':
diff --cc src/bin/psql/describe.c
index dd1179ef927,5e31ceba437..00000000000
--- a/src/bin/psql/describe.c
+++ b/src/bin/psql/describe.c
@@@ -4242,7 -4047,7 +4243,11 @@@ listTables(const char *tabtypes, const 
  	bool		showMatViews = strchr(tabtypes, 'm') != NULL;
  	bool		showSeq = strchr(tabtypes, 's') != NULL;
  	bool		showForeign = strchr(tabtypes, 'E') != NULL;
++<<<<<<< ours
 +	bool		showPropGraphs = strchr(tabtypes, 'G') != NULL;
++=======
+ 	bool		showNoPartitions = strchr(tabtypes, 'N') != NULL;
++>>>>>>> theirs
  
  	int			ntypes;
  	PQExpBufferData buf;
@@@ -4251,12 -4056,26 +4256,33 @@@
  	int			cols_so_far;
  	bool		translate_columns[] = {false, false, true, false, false, false, false, false, false};
  
+ 	/*
+ 	 * Note: Declarative table partitioning is only supported as of Pg 10.0.
+ 	 */
+ 	if (showNoPartitions && pset.sversion < 100000)
+ 	{
+ 		showNoPartitions = false;
+ 	}
+ 
  	/* Count the number of explicitly-requested relation types */
  	ntypes = showTables + showIndexes + showViews + showMatViews +
++<<<<<<< ours
 +		showSeq + showForeign + showPropGraphs;
 +	/* If none, we default to \dtvmsEG (but see also command.c) */
 +	if (ntypes == 0)
 +		showTables = showViews = showMatViews = showSeq = showForeign = showPropGraphs = true;
++=======
+ 		showSeq + showForeign;
+ 
+ 	if (ntypes == 0)
+ 	{
+ 		if (showNoPartitions)
+ 			showTables = showIndexes = true;
+ 		else
+ 			/* If none, we default to \dtvmsE (but see also command.c) */
+ 			showTables = showViews = showMatViews = showSeq = showForeign = true;
+ 	}
++>>>>>>> theirs
  
  	initPQExpBuffer(&buf);