=== Applying patches on top of PostgreSQL commit ID 9f07de2053163cda9acb68c34d8be4b56f9659d4 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Mon Oct  5 04:29:32 UTC 2026
On branch cf/7128
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v1-0001-Support-DDL-deparse-for-CREATE-TABLE-command.patch ===
Applying: Support DDL deparse for CREATE TABLE command.
Using index info to reconstruct a base tree...
M	src/backend/commands/Makefile
M	src/backend/commands/meson.build
M	src/tools/pgindent/typedefs.list
Falling back to patching base and 3-way merge...
Auto-merging src/tools/pgindent/typedefs.list
CONFLICT (content): Merge conflict in src/tools/pgindent/typedefs.list
Auto-merging src/backend/commands/meson.build
Auto-merging src/backend/commands/Makefile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Support DDL deparse for CREATE TABLE command.
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 ./v1-0001-Support-DDL-deparse-for-CREATE-TABLE-command.patch ===
patching file src/backend/commands/Makefile
patching file src/backend/commands/ddl_deparse.c
patching file src/backend/commands/ddl_json.c
patching file src/backend/commands/meson.build
patching file src/backend/utils/adt/format_type.c
patching file src/include/commands/ddl_deparse.h
patching file src/include/utils/builtins.h
patching file src/tools/pgindent/typedefs.list
Hunk #1 succeeded at 2399 (offset -23 lines).
Hunk #2 FAILED at 3184.
Hunk #3 succeeded at 3674 (offset -24 lines).
Hunk #4 succeeded at 3907 (offset -24 lines).
1 out of 4 hunks FAILED -- saving rejects to file src/tools/pgindent/typedefs.list.rej
Unstaged changes after reset:
M	src/backend/commands/Makefile
M	src/backend/commands/meson.build
M	src/backend/utils/adt/format_type.c
M	src/include/utils/builtins.h
M	src/tools/pgindent/typedefs.list
Removing src/backend/commands/ddl_deparse.c
Removing src/backend/commands/ddl_json.c
Removing src/include/commands/ddl_deparse.h
Removing src/tools/pgindent/typedefs.list.rej
=== using 'git apply' to apply patch ./v1-0001-Support-DDL-deparse-for-CREATE-TABLE-command.patch ===
Applied patch to 'src/backend/commands/Makefile' cleanly.
Falling back to direct application...
Falling back to direct application...
Applied patch to 'src/backend/commands/meson.build' cleanly.
Applied patch to 'src/backend/utils/adt/format_type.c' cleanly.
Falling back to direct application...
Applied patch to 'src/include/utils/builtins.h' cleanly.
Applied patch to 'src/tools/pgindent/typedefs.list' with conflicts.
U src/tools/pgindent/typedefs.list
diff --cc src/tools/pgindent/typedefs.list
index d001f56efae,a03df297fa1..00000000000
--- a/src/tools/pgindent/typedefs.list
+++ b/src/tools/pgindent/typedefs.list
@@@ -3157,7 -3184,7 +3158,11 @@@ Tcl_Ob
  Tcl_Size
  Tcl_Time
  TempNamespaceStatus
++<<<<<<< ours
 +TestCustomScanState
++=======
+ TestDDLDeparseErrorInfo
++>>>>>>> theirs
  TestDSMRegistryHashEntry
  TestDSMRegistryStruct
  TestDecodingData