=== Applying patches on top of PostgreSQL commit ID ef1b740441cbd88f8f4c68737235cce17bfac508 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Thu Nov 12 19:16:28 UTC 2026 On branch cf/7437 nothing to commit, working tree clean === using 'git am' to apply patch ./v4-0001-Implement-SELECT-EXCLUDE-REPLACE-RENAME-clauses.patch === Applying: Implement SELECT * EXCLUDE/REPLACE/RENAME clauses Using index info to reconstruct a base tree... M src/backend/parser/analyze.c M src/include/nodes/parsenodes.h M src/test/regress/parallel_schedule 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/test/regress/parallel_schedule CONFLICT (content): Merge conflict in src/test/regress/parallel_schedule Auto-merging src/include/nodes/parsenodes.h Auto-merging src/backend/parser/analyze.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 Implement SELECT * EXCLUDE/REPLACE/RENAME clauses 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 ./v4-0001-Implement-SELECT-EXCLUDE-REPLACE-RENAME-clauses.patch === patching file doc/src/sgml/ref/select.sgml patching file src/backend/parser/analyze.c Hunk #1 succeeded at 1745 (offset 6 lines). patching file src/backend/parser/gram.y patching file src/backend/parser/parse_expr.c patching file src/backend/parser/parse_relation.c patching file src/backend/parser/parse_target.c patching file src/include/nodes/parsenodes.h patching file src/include/parser/parse_relation.h patching file src/test/regress/expected/select_staroptions.out patching file src/test/regress/parallel_schedule Hunk #1 FAILED at 102. 1 out of 1 hunk FAILED -- saving rejects to file src/test/regress/parallel_schedule.rej patching file src/test/regress/sql/select_staroptions.sql patching file src/tools/pgindent/typedefs.list Hunk #1 succeeded at 2987 (offset 7 lines). Unstaged changes after reset: M doc/src/sgml/ref/select.sgml M src/backend/parser/analyze.c M src/backend/parser/gram.y M src/backend/parser/parse_expr.c M src/backend/parser/parse_relation.c M src/backend/parser/parse_target.c M src/include/nodes/parsenodes.h M src/include/parser/parse_relation.h M src/tools/pgindent/typedefs.list Removing src/test/regress/expected/select_staroptions.out Removing src/test/regress/parallel_schedule.rej Removing src/test/regress/sql/select_staroptions.sql === using 'git apply' to apply patch ./v4-0001-Implement-SELECT-EXCLUDE-REPLACE-RENAME-clauses.patch === Applied patch to 'doc/src/sgml/ref/select.sgml' cleanly. Applied patch to 'src/backend/parser/analyze.c' cleanly. Applied patch to 'src/backend/parser/gram.y' cleanly. Applied patch to 'src/backend/parser/parse_expr.c' cleanly. Applied patch to 'src/backend/parser/parse_relation.c' cleanly. Applied patch to 'src/backend/parser/parse_target.c' cleanly. Applied patch to 'src/include/nodes/parsenodes.h' cleanly. Applied patch to 'src/include/parser/parse_relation.h' cleanly. Falling back to direct application... Applied patch to 'src/test/regress/parallel_schedule' with conflicts. Falling back to direct application... Applied patch to 'src/tools/pgindent/typedefs.list' cleanly. U src/test/regress/parallel_schedule diff --cc src/test/regress/parallel_schedule index bb13a7b6b8f,5fde04091f0..00000000000 --- a/src/test/regress/parallel_schedule +++ b/src/test/regress/parallel_schedule @@@ -102,7 -102,7 +102,11 @@@ test: publication subscriptio # Another group of parallel tests # select_views depends on create_view # ---------- ++<<<<<<< ours +test: select_views portals_p2 portals_inflight foreign_key dependency guc bitmapops combocid tsearch tsdicts foreign_data window xmlmap functional_deps advisory_lock indirect_toast equivclass stats_rewrite alter_column_type ++======= + test: select_views select_staroptions portals_p2 foreign_key dependency guc bitmapops combocid tsearch tsdicts foreign_data window xmlmap functional_deps advisory_lock indirect_toast equivclass stats_rewrite ++>>>>>>> theirs # ---------- # Another group of parallel tests (JSON related)