=== Applying patches on top of PostgreSQL commit ID 98b1efd6ef6a1612019ef9ed6e44b79c132352ce ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Wed Jan  1 06:26:26 UTC 2025
On branch cf/4764
nothing to commit, working tree clean
=== applying patch ./v5-0001-Improve-SQL-comments-on-echo-hidden-output.patch
/work/patches/./v5-0001-Improve-SQL-comments-on-echo-hidden-output.patch:154: indent with spaces.
    int len = strlen(string);
/work/patches/./v5-0001-Improve-SQL-comments-on-echo-hidden-output.patch:156: indent with spaces.
    int lineEnd = MAX_COMMENT_WIDTH - 6; // Accounting for " * " at the start and " *" at the end of each line
/work/patches/./v5-0001-Improve-SQL-comments-on-echo-hidden-output.patch:157: indent with spaces.
    static char spaces[MAX_COMMENT_WIDTH] = {0};
/work/patches/./v5-0001-Improve-SQL-comments-on-echo-hidden-output.patch:159: indent with spaces.
    if (spaces[0] != ' ')
/work/patches/./v5-0001-Improve-SQL-comments-on-echo-hidden-output.patch:160: indent with spaces.
        memset(spaces, ' ', MAX_COMMENT_WIDTH);
Applied patch to 'src/bin/psql/command.c' cleanly.
Applied patch to 'src/bin/psql/common.c' cleanly.
Applied patch to 'src/bin/psql/common.h' cleanly.
Applied patch to 'src/bin/psql/describe.c' with conflicts.
U src/bin/psql/describe.c
warning: squelched 22 whitespace errors
warning: 27 lines add whitespace errors.
diff --cc src/bin/psql/describe.c
index 2657abdc72,53b8fdd469..0000000000
--- a/src/bin/psql/describe.c
+++ b/src/bin/psql/describe.c
@@@ -3085,20 -3074,21 +3101,35 @@@ describeOneTableDetails(const char *sch
  			PQclear(result);
  		}
  
 -		/* If verbose, print NOT NULL constraints */
 +		/*
 +		 * If verbose, print NOT NULL constraints.
 +		 */
  		if (verbose)
  		{
++<<<<<<< ours
 +			printfPQExpBuffer(&buf,
 +							  "SELECT c.conname, a.attname, c.connoinherit,\n"
 +							  "  c.conislocal, c.coninhcount <> 0\n"
 +							  "FROM pg_catalog.pg_constraint c JOIN\n"
 +							  "  pg_catalog.pg_attribute a ON\n"
 +							  "    (a.attrelid = c.conrelid AND a.attnum = c.conkey[1])\n"
 +							  "WHERE c.contype = " CppAsString2(CONSTRAINT_NOTNULL) " AND\n"
 +							  "  c.conrelid = '%s'::pg_catalog.regclass\n"
 +							  "ORDER BY a.attnum",
++=======
+ 			OutputComment(&buf, _("Get information about NOT NULL constraints"));
+ 			appendPQExpBuffer(&buf,
+ 							  "SELECT co.conname, at.attname, co.connoinherit, co.conislocal,\n"
+ 							  "co.coninhcount <> 0\n"
+ 							  "FROM pg_catalog.pg_constraint co JOIN\n"
+ 							  "pg_catalog.pg_attribute at ON\n"
+ 							  "(at.attnum = co.conkey[1])\n"
+ 							  "WHERE co.contype = 'n' AND\n"
+ 							  "co.conrelid = '%s'::pg_catalog.regclass AND\n"
+ 							  "at.attrelid = '%s'::pg_catalog.regclass\n"
+ 							  "ORDER BY at.attnum",
+ 							  oid,
++>>>>>>> theirs
  							  oid);
  
  			result = PSQLexec(buf.data);