=== Applying patches on top of PostgreSQL commit ID c902bd57af998b52bde98c87916190309639129e === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Sat Nov 29 23:09:20 UTC 2025 On branch cf/6212 nothing to commit, working tree clean === using 'git am' to apply patch ./v4-0001-Add-pg_get_domain_ddl-function-to-reconstruct-CRE.patch === Applying: Add pg_get_domain_ddl() function to reconstruct CREATE DOMAIN statements Using index info to reconstruct a base tree... M src/include/catalog/pg_proc.dat M src/test/regress/parallel_schedule Falling back to patching base and 3-way merge... Auto-merging src/test/regress/parallel_schedule CONFLICT (content): Merge conflict in src/test/regress/parallel_schedule Auto-merging src/include/catalog/pg_proc.dat error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 Add pg_get_domain_ddl() function to reconstruct CREATE DOMAIN statements 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". Unstaged changes after reset: M doc/src/sgml/func/func-info.sgml M src/backend/catalog/system_functions.sql M src/backend/utils/adt/ruleutils.c M src/include/catalog/pg_proc.dat M src/test/regress/parallel_schedule Removing src/test/regress/expected/object_ddl.out Removing src/test/regress/sql/object_ddl.sql === using patch(1) to apply patch ./v4-0001-Add-pg_get_domain_ddl-function-to-reconstruct-CRE.patch === patching file doc/src/sgml/func/func-info.sgml patching file src/backend/catalog/system_functions.sql patching file src/backend/utils/adt/ruleutils.c patching file src/include/catalog/pg_proc.dat patching file src/test/regress/expected/object_ddl.out patching file src/test/regress/parallel_schedule Hunk #1 FAILED at 28. 1 out of 1 hunk FAILED -- saving rejects to file src/test/regress/parallel_schedule.rej patching file src/test/regress/sql/object_ddl.sql Unstaged changes after reset: M doc/src/sgml/func/func-info.sgml M src/backend/catalog/system_functions.sql M src/backend/utils/adt/ruleutils.c M src/include/catalog/pg_proc.dat Removing src/test/regress/expected/object_ddl.out Removing src/test/regress/parallel_schedule.rej Removing src/test/regress/sql/object_ddl.sql === using 'git apply' to apply patch ./v4-0001-Add-pg_get_domain_ddl-function-to-reconstruct-CRE.patch === Applied patch to 'doc/src/sgml/func/func-info.sgml' cleanly. Applied patch to 'src/backend/catalog/system_functions.sql' cleanly. Applied patch to 'src/backend/utils/adt/ruleutils.c' cleanly. Applied patch to 'src/include/catalog/pg_proc.dat' cleanly. Falling back to direct application... Applied patch to 'src/test/regress/parallel_schedule' with conflicts. Falling back to direct application... U src/test/regress/parallel_schedule diff --cc src/test/regress/parallel_schedule index cc6d799bcea,8b6881c397f..00000000000 --- a/src/test/regress/parallel_schedule +++ b/src/test/regress/parallel_schedule @@@ -28,7 -28,7 +28,11 @@@ test: strings md5 numerology point lse # geometry depends on point, lseg, line, box, path, polygon, circle # horology depends on date, time, timetz, timestamp, timestamptz, interval # ---------- ++<<<<<<< ours +test: geometry horology tstypes regex type_sanity opr_sanity misc_sanity comments expressions unicode xid mvcc database stats_import pg_ndistinct pg_dependencies ++======= + test: geometry horology tstypes regex type_sanity opr_sanity misc_sanity comments expressions unicode xid mvcc database stats_import object_ddl ++>>>>>>> theirs # ---------- # Load huge amounts of data