=== Applying patches on top of PostgreSQL commit ID 81b2179b492e3af891544813b7e22a42386b34d0 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Sun Nov 15 05:04:30 UTC 2026 On branch cf/7640 nothing to commit, working tree clean === using 'git am' to apply patch ./v1-0001-Move-makeAlterConfigCommand-to-fe_utils.patch === Applying: Move makeAlterConfigCommand() to fe_utils === using 'git am' to apply patch ./v1-0002-pg_upgrade-Check-stored-settings-against-the-new-.patch === Applying: pg_upgrade: Check stored settings against the new cluster Using index info to reconstruct a base tree... M src/bin/pg_upgrade/Makefile M src/bin/pg_upgrade/meson.build M src/tools/pgindent/typedefs.list Falling back to patching base and 3-way merge... Auto-merging src/tools/pgindent/typedefs.list Auto-merging src/bin/pg_upgrade/meson.build CONFLICT (content): Merge conflict in src/bin/pg_upgrade/meson.build Auto-merging src/bin/pg_upgrade/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 pg_upgrade: Check stored settings against the new cluster 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-0002-pg_upgrade-Check-stored-settings-against-the-new-.patch === patching file src/bin/pg_upgrade/Makefile Hunk #1 succeeded at 29 (offset 4 lines). patching file src/bin/pg_upgrade/check.c patching file src/bin/pg_upgrade/meson.build Hunk #2 FAILED at 70. 1 out of 2 hunks FAILED -- saving rejects to file src/bin/pg_upgrade/meson.build.rej patching file src/bin/pg_upgrade/nls.mk patching file src/bin/pg_upgrade/pg_upgrade.h patching file src/bin/pg_upgrade/settings.c patching file src/bin/pg_upgrade/t/009_stored_settings.pl patching file src/tools/pgindent/typedefs.list Hunk #1 succeeded at 3008 (offset 7 lines). Unstaged changes after reset: M src/bin/pg_upgrade/Makefile M src/bin/pg_upgrade/check.c M src/bin/pg_upgrade/meson.build M src/bin/pg_upgrade/nls.mk M src/bin/pg_upgrade/pg_upgrade.h M src/tools/pgindent/typedefs.list Removing src/bin/pg_upgrade/meson.build.rej Removing src/bin/pg_upgrade/settings.c Removing src/bin/pg_upgrade/t/009_stored_settings.pl === using 'git apply' to apply patch ./v1-0002-pg_upgrade-Check-stored-settings-against-the-new-.patch === Applied patch to 'src/bin/pg_upgrade/Makefile' cleanly. Applied patch to 'src/bin/pg_upgrade/check.c' cleanly. Applied patch to 'src/bin/pg_upgrade/meson.build' with conflicts. Applied patch to 'src/bin/pg_upgrade/nls.mk' cleanly. Applied patch to 'src/bin/pg_upgrade/pg_upgrade.h' cleanly. Falling back to direct application... Falling back to direct application... Applied patch to 'src/tools/pgindent/typedefs.list' cleanly. U src/bin/pg_upgrade/meson.build diff --cc src/bin/pg_upgrade/meson.build index 892be18780e,f79a6bcd43b..00000000000 --- a/src/bin/pg_upgrade/meson.build +++ b/src/bin/pg_upgrade/meson.build @@@ -69,7 -70,7 +70,11 @@@ tests += 't/006_transfer_modes.pl', 't/007_multixact_conversion.pl', 't/008_extension_control_path.pl', ++<<<<<<< ours + 't/009_composite_types.pl', ++======= + 't/009_stored_settings.pl', ++>>>>>>> theirs ], 'deps': [test_ext], 'test_kwargs': {'priority': 40}, # pg_upgrade tests are slow