=== Applying patches on top of PostgreSQL commit ID d0d1bcb1e8b2e324bc243d69ccfce55b25a79f8c === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Wed Jun 18 22:32:22 UTC 2025 On branch cf/5733 nothing to commit, working tree clean === using 'git am' to apply patch ./v5-0001-Normalize-variable-fetch-sizes-in-a-FETCH-command.patch === Applying: Normalize variable fetch sizes in a FETCH command Using index info to reconstruct a base tree... M contrib/pg_stat_statements/expected/level_tracking.out M contrib/pg_stat_statements/expected/utility.out M src/backend/parser/gram.y M src/include/nodes/parsenodes.h 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/include/nodes/parsenodes.h Auto-merging src/backend/parser/gram.y Auto-merging contrib/pg_stat_statements/expected/utility.out Auto-merging contrib/pg_stat_statements/expected/level_tracking.out CONFLICT (content): Merge conflict in contrib/pg_stat_statements/expected/level_tracking.out error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 Normalize variable fetch sizes in a FETCH 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". Unstaged changes after reset: M contrib/pg_stat_statements/expected/cursors.out M contrib/pg_stat_statements/expected/level_tracking.out M contrib/pg_stat_statements/expected/utility.out M contrib/pg_stat_statements/sql/cursors.sql M src/backend/parser/gram.y M src/include/nodes/parsenodes.h M src/tools/pgindent/typedefs.list === using patch(1) to apply patch ./v5-0001-Normalize-variable-fetch-sizes-in-a-FETCH-command.patch === patching file contrib/pg_stat_statements/expected/cursors.out patching file contrib/pg_stat_statements/expected/level_tracking.out Hunk #1 FAILED at 1142. Hunk #2 succeeded at 1176 (offset 4 lines). 1 out of 2 hunks FAILED -- saving rejects to file contrib/pg_stat_statements/expected/level_tracking.out.rej patching file contrib/pg_stat_statements/expected/utility.out patching file contrib/pg_stat_statements/sql/cursors.sql patching file src/backend/parser/gram.y Hunk #1 succeeded at 7477 (offset -2 lines). Hunk #2 succeeded at 7488 (offset -2 lines). Hunk #3 succeeded at 7510 (offset -2 lines). Hunk #4 succeeded at 7521 (offset -2 lines). Hunk #5 succeeded at 7532 (offset -2 lines). Hunk #6 succeeded at 7543 (offset -2 lines). Hunk #7 succeeded at 7554 (offset -2 lines). Hunk #8 succeeded at 7565 (offset -2 lines). Hunk #9 succeeded at 7576 (offset -2 lines). Hunk #10 succeeded at 7587 (offset -2 lines). Hunk #11 succeeded at 7598 (offset -2 lines). Hunk #12 succeeded at 7609 (offset -2 lines). Hunk #13 succeeded at 7620 (offset -2 lines). Hunk #14 succeeded at 7631 (offset -2 lines). Hunk #15 succeeded at 7642 (offset -2 lines). patching file src/include/nodes/parsenodes.h patching file src/tools/pgindent/typedefs.list Hunk #1 FAILED at 4305. 1 out of 1 hunk FAILED -- saving rejects to file src/tools/pgindent/typedefs.list.rej Unstaged changes after reset: M contrib/pg_stat_statements/expected/cursors.out M contrib/pg_stat_statements/expected/level_tracking.out M contrib/pg_stat_statements/expected/utility.out M contrib/pg_stat_statements/sql/cursors.sql M src/backend/parser/gram.y M src/include/nodes/parsenodes.h Removing contrib/pg_stat_statements/expected/level_tracking.out.rej Removing src/tools/pgindent/typedefs.list.rej === using 'git apply' to apply patch ./v5-0001-Normalize-variable-fetch-sizes-in-a-FETCH-command.patch === Applied patch to 'contrib/pg_stat_statements/expected/cursors.out' cleanly. Applied patch to 'contrib/pg_stat_statements/expected/level_tracking.out' with conflicts. Applied patch to 'contrib/pg_stat_statements/expected/utility.out' cleanly. Applied patch to 'contrib/pg_stat_statements/sql/cursors.sql' cleanly. Applied patch to 'src/backend/parser/gram.y' cleanly. Applied patch to 'src/include/nodes/parsenodes.h' cleanly. Applied patch to 'src/tools/pgindent/typedefs.list' with conflicts. U contrib/pg_stat_statements/expected/level_tracking.out U src/tools/pgindent/typedefs.list diff --cc contrib/pg_stat_statements/expected/level_tracking.out index 8213fcd2e61,ce4bd3a823d..00000000000 --- a/contrib/pg_stat_statements/expected/level_tracking.out +++ b/contrib/pg_stat_statements/expected/level_tracking.out @@@ -1146,8 -1142,8 +1146,13 @@@ SELECT toplevel, calls, query FROM pg_s t | 1 | CLOSE foocur t | 1 | COMMIT t | 1 | DECLARE FOOCUR CURSOR FOR SELECT * from stats_track_tab ++<<<<<<< ours + f | 1 | DECLARE FOOCUR CURSOR FOR SELECT * from stats_track_tab; + t | 1 | FETCH FORWARD 1 FROM foocur ++======= + t | 1 | FETCH FORWARD $1 FROM foocur + f | 1 | SELECT * from stats_track_tab ++>>>>>>> theirs t | 1 | SELECT pg_stat_statements_reset() IS NOT NULL AS t (7 rows) diff --cc src/tools/pgindent/typedefs.list index 32d6e718adc,8b15ac5c307..00000000000 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@@ -4334,3 -4302,7 +4334,10 @@@ yyscan_ z_stream z_streamp zic_t ++<<<<<<< ours ++======= + ExplainExtensionOption + ExplainOptionHandler + overexplain_options + FetchDirectionKeywords ++>>>>>>> theirs