=== Applying patches on top of PostgreSQL commit ID e4309f73f698851a2f7d49ca5e98e3e188400891 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Thu Apr 3 11:12:26 UTC 2025 On branch cf/5473 nothing to commit, working tree clean === using 'git am' to apply patch ./v15-0001-Proposal-for-progressive-explains.patch === Applying: Proposal for progressive explains Using index info to reconstruct a base tree... M src/backend/catalog/system_views.sql M src/backend/storage/lmgr/proc.c M src/backend/utils/activity/wait_event_names.txt M src/backend/utils/init/postinit.c M src/include/catalog/pg_proc.dat M src/include/storage/lwlocklist.h M src/test/regress/expected/rules.out 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/expected/rules.out Auto-merging src/include/storage/lwlocklist.h Auto-merging src/include/catalog/pg_proc.dat CONFLICT (content): Merge conflict in src/include/catalog/pg_proc.dat Auto-merging src/backend/utils/init/postinit.c Auto-merging src/backend/utils/activity/wait_event_names.txt Auto-merging src/backend/storage/lmgr/proc.c Auto-merging src/backend/catalog/system_views.sql error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 Proposal for progressive explains 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/auto_explain/auto_explain.c M doc/src/sgml/config.sgml M doc/src/sgml/monitoring.sgml M doc/src/sgml/perform.sgml M src/backend/access/transam/xact.c M src/backend/catalog/system_views.sql M src/backend/commands/Makefile M src/backend/commands/explain.c M src/backend/commands/explain_format.c M src/backend/commands/meson.build M src/backend/executor/execMain.c M src/backend/executor/execProcnode.c M src/backend/executor/instrument.c M src/backend/storage/ipc/ipci.c M src/backend/storage/lmgr/lwlock.c M src/backend/storage/lmgr/proc.c M src/backend/tcop/pquery.c M src/backend/utils/activity/wait_event_names.txt M src/backend/utils/init/postinit.c M src/backend/utils/misc/guc_tables.c M src/backend/utils/misc/postgresql.conf.sample M src/include/catalog/pg_proc.dat M src/include/commands/explain_state.h M src/include/executor/execdesc.h M src/include/executor/instrument.h M src/include/nodes/execnodes.h M src/include/storage/lwlock.h M src/include/storage/lwlocklist.h M src/include/storage/proc.h M src/include/utils/guc.h M src/include/utils/timeout.h M src/test/regress/expected/rules.out M src/tools/pgindent/typedefs.list Removing src/backend/commands/explain_progressive.c Removing src/include/commands/explain_progressive.h Removing src/test/modules/test_misc/t/008_progressive_explain.pl === using patch(1) to apply patch ./v15-0001-Proposal-for-progressive-explains.patch === patch: unrecognized option `--no-backup-if-mismatch' usage: patch [-bCcEeflNnRstuv] [-B backup-prefix] [-D symbol] [-d directory] [-F max-fuzz] [-i patchfile] [-o out-file] [-p strip-count] [-r rej-name] [-V t | nil | never | none] [-x number] [-z backup-ext] [--posix] [origfile [patchfile]] patch 'int4', prosrc => 'gist_stratnum_common' }, ++<<<<<<< ours +# AIO related functions +{ oid => '9200', descr => 'information about in-progress asynchronous IOs', + proname => 'pg_get_aios', prorows => '100', proretset => 't', + provolatile => 'v', proparallel => 'r', prorettype => 'record', proargtypes => '', + proallargtypes => '{int4,int4,int8,text,text,int8,int8,text,int2,int4,text,text,bool,bool,bool}', + proargmodes => '{o,o,o,o,o,o,o,o,o,o,o,o,o,o,o}', + proargnames => '{pid,io_id,io_generation,state,operation,off,length,target,handle_data_len,raw_result,result,target_desc,f_sync,f_localmem,f_buffered}', + prosrc => 'pg_get_aios' }, ++======= + { oid => '8770', + descr => 'statistics: information about progress of backends running statements', + proname => 'pg_stat_progress_explain', prorows => '100', proisstrict => 'f', + proretset => 't', provolatile => 's', proparallel => 'r', + prorettype => 'record', proargtypes => '', + proallargtypes => '{oid,int4,timestamptz,text}', + proargmodes => '{o,o,o,o}', + proargnames => '{datid,pid,last_update,query_plan}', + prosrc => 'pg_stat_progress_explain' }, ++>>>>>>> theirs ]