=== Applying patches on top of PostgreSQL commit ID 9e1183953f0aee6b8040cd782a8af9996f5ca942 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Wed Jun 18 02:18:21 UTC 2025 On branch cf/5795 nothing to commit, working tree clean === using 'git am' to apply patch ./v2-0001-Pathify-RHS-unique-ification-for-semijoin-plannin.patch === Applying: Pathify RHS unique-ification for semijoin planning Using index info to reconstruct a base tree... 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 error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 Pathify RHS unique-ification for semijoin planning 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 src/backend/optimizer/README M src/backend/optimizer/path/costsize.c M src/backend/optimizer/path/joinpath.c M src/backend/optimizer/path/joinrels.c M src/backend/optimizer/plan/createplan.c M src/backend/optimizer/plan/planner.c M src/backend/optimizer/prep/prepunion.c M src/backend/optimizer/util/pathnode.c M src/backend/optimizer/util/relnode.c M src/include/nodes/nodes.h M src/include/nodes/pathnodes.h M src/include/optimizer/pathnode.h M src/include/optimizer/planner.h M src/test/regress/expected/join.out M src/test/regress/expected/partition_join.out M src/test/regress/expected/subselect.out M src/test/regress/sql/subselect.sql M src/tools/pgindent/typedefs.list === using patch(1) to apply patch ./v2-0001-Pathify-RHS-unique-ification-for-semijoin-plannin.patch === patching file src/backend/optimizer/README patching file src/backend/optimizer/path/costsize.c patching file src/backend/optimizer/path/joinpath.c patching file src/backend/optimizer/path/joinrels.c patching file src/backend/optimizer/plan/createplan.c patching file src/backend/optimizer/plan/planner.c patching file src/backend/optimizer/prep/prepunion.c patching file src/backend/optimizer/util/pathnode.c patching file src/backend/optimizer/util/relnode.c patching file src/include/nodes/nodes.h patching file src/include/nodes/pathnodes.h patching file src/include/optimizer/pathnode.h patching file src/include/optimizer/planner.h patching file src/test/regress/expected/join.out patching file src/test/regress/expected/partition_join.out patching file src/test/regress/expected/subselect.out patching file src/test/regress/sql/subselect.sql patching file src/tools/pgindent/typedefs.list Hunk #1 FAILED at 3140. Hunk #2 succeeded at 3164 (offset 9 lines). 1 out of 2 hunks FAILED -- saving rejects to file src/tools/pgindent/typedefs.list.rej Unstaged changes after reset: M src/backend/optimizer/README M src/backend/optimizer/path/costsize.c M src/backend/optimizer/path/joinpath.c M src/backend/optimizer/path/joinrels.c M src/backend/optimizer/plan/createplan.c M src/backend/optimizer/plan/planner.c M src/backend/optimizer/prep/prepunion.c M src/backend/optimizer/util/pathnode.c M src/backend/optimizer/util/relnode.c M src/include/nodes/nodes.h M src/include/nodes/pathnodes.h M src/include/optimizer/pathnode.h M src/include/optimizer/planner.h M src/test/regress/expected/join.out M src/test/regress/expected/partition_join.out M src/test/regress/expected/subselect.out M src/test/regress/sql/subselect.sql M src/tools/pgindent/typedefs.list Removing src/tools/pgindent/typedefs.list.rej === using 'git apply' to apply patch ./v2-0001-Pathify-RHS-unique-ification-for-semijoin-plannin.patch === Applied patch to 'src/backend/optimizer/README' cleanly. Applied patch to 'src/backend/optimizer/path/costsize.c' cleanly. Applied patch to 'src/backend/optimizer/path/joinpath.c' cleanly. Applied patch to 'src/backend/optimizer/path/joinrels.c' cleanly. Applied patch to 'src/backend/optimizer/plan/createplan.c' cleanly. Applied patch to 'src/backend/optimizer/plan/planner.c' cleanly. Applied patch to 'src/backend/optimizer/prep/prepunion.c' cleanly. Applied patch to 'src/backend/optimizer/util/pathnode.c' cleanly. Applied patch to 'src/backend/optimizer/util/relnode.c' cleanly. Applied patch to 'src/include/nodes/nodes.h' cleanly. Applied patch to 'src/include/nodes/pathnodes.h' cleanly. Applied patch to 'src/include/optimizer/pathnode.h' cleanly. Applied patch to 'src/include/optimizer/planner.h' cleanly. Applied patch to 'src/test/regress/expected/join.out' cleanly. Applied patch to 'src/test/regress/expected/partition_join.out' cleanly. Applied patch to 'src/test/regress/expected/subselect.out' cleanly. Applied patch to 'src/test/regress/sql/subselect.sql' 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 32d6e718adc,6b715d456c6..00000000000 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@@ -3148,8 -3140,6 +3148,11 @@@ UnicodeNormalizationFor UnicodeNormalizationQC Unique UniquePath ++<<<<<<< ours +UniquePathMethod +UniqueRelInfo ++======= ++>>>>>>> theirs UniqueState UnlistenStmt UnresolvedTup