=== Applying patches on top of PostgreSQL commit ID a625e153b7d2f0e1c81955d13f2fc8de472bc082 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Wed Nov  4 12:16:27 UTC 2026
On branch cf/7321
nothing to commit, working tree clean
=== using 'git am' to apply patch ./0001-Fix-crash-in-pg_identify_object-when-an-object-s-sch.patch ===
Applying: Fix crash in pg_identify_object() when an object's schema is missing
Using index info to reconstruct a base tree...
M	src/backend/catalog/objectaddress.c
Falling back to patching base and 3-way merge...
Auto-merging src/backend/catalog/objectaddress.c
CONFLICT (content): Merge conflict in src/backend/catalog/objectaddress.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 crash in pg_identify_object() when an object's schema is missing
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 ./0001-Fix-crash-in-pg_identify_object-when-an-object-s-sch.patch ===
patching file src/backend/catalog/objectaddress.c
Hunk #1 FAILED at 4379.
Hunk #2 succeeded at 6253 (offset 5 lines).
1 out of 2 hunks FAILED -- saving rejects to file src/backend/catalog/objectaddress.c.rej
Unstaged changes after reset:
M	src/backend/catalog/objectaddress.c
Removing src/backend/catalog/objectaddress.c.rej
=== using 'git apply' to apply patch ./0001-Fix-crash-in-pg_identify_object-when-an-object-s-sch.patch ===
Applied patch to 'src/backend/catalog/objectaddress.c' with conflicts.
U src/backend/catalog/objectaddress.c
diff --cc src/backend/catalog/objectaddress.c
index dcc267bfa70,71efd3928e0..00000000000
--- a/src/backend/catalog/objectaddress.c
+++ b/src/backend/catalog/objectaddress.c
@@@ -4386,7 -4384,6 +4386,10 @@@ pg_identify_object(PG_FUNCTION_ARGS
  	{
  		char	   *nspname = get_namespace_name(schema_oid);
  
++<<<<<<< ours
 +		/* The schema may have been dropped concurrently; report it as NULL */
++=======
++>>>>>>> theirs
  		if (nspname != NULL)
  		{
  			values[1] = CStringGetTextDatum(quote_identifier(nspname));