=== Applying patches on top of PostgreSQL commit ID a9afa021e95f2b0ffaaf26f3a27e685f634f4ac9 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Mon Feb 2 12:29:24 UTC 2026 On branch cf/6272 nothing to commit, working tree clean === using 'git am' to apply patch ./v5-0001-Add-log_object_drops-GUC-for-DROP-TABLE-DATABASE-.patch === Applying: Add log_object_drops GUC for DROP TABLE/DATABASE logging .git/rebase-apply/patch:158: indent with spaces. XLogRecPtr commit_lsn = InvalidXLogRecPtr; .git/rebase-apply/patch:322: indent with spaces. return; .git/rebase-apply/patch:364: indent with spaces. return; warning: 3 lines add whitespace errors. Using index info to reconstruct a base tree... M contrib/postgres_fdw/connection.c M contrib/sepgsql/label.c M doc/src/sgml/config.sgml M src/backend/access/transam/xact.c M src/backend/catalog/dependency.c M src/backend/commands/dbcommands.c M src/backend/utils/misc/guc_parameters.dat M src/backend/utils/misc/guc_tables.c M src/include/access/xact.h M src/include/utils/guc.h M src/pl/plpgsql/src/pl_exec.c M src/pl/plpgsql/src/plpgsql.h M src/test/recovery/meson.build Falling back to patching base and 3-way merge... Auto-merging src/test/recovery/meson.build CONFLICT (content): Merge conflict in src/test/recovery/meson.build Auto-merging src/pl/plpgsql/src/plpgsql.h Auto-merging src/pl/plpgsql/src/pl_exec.c Auto-merging src/include/utils/guc.h Auto-merging src/include/access/xact.h Auto-merging src/backend/utils/misc/guc_tables.c Auto-merging src/backend/utils/misc/guc_parameters.dat Auto-merging src/backend/commands/dbcommands.c Auto-merging src/backend/catalog/dependency.c Auto-merging src/backend/access/transam/xact.c Auto-merging doc/src/sgml/config.sgml Auto-merging contrib/sepgsql/label.c Auto-merging contrib/postgres_fdw/connection.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 Add log_object_drops GUC for DROP TABLE/DATABASE logging 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/postgres_fdw/connection.c M contrib/sepgsql/label.c M doc/src/sgml/config.sgml M src/backend/access/transam/xact.c M src/backend/catalog/dependency.c M src/backend/commands/dbcommands.c M src/backend/utils/misc/guc_parameters.dat M src/backend/utils/misc/guc_tables.c M src/include/access/xact.h M src/include/utils/guc.h M src/pl/plpgsql/src/pl_exec.c M src/pl/plpgsql/src/plpgsql.h M src/test/recovery/meson.build Removing src/test/recovery/t/050_drop_table_logging.pl === using patch(1) to apply patch ./v5-0001-Add-log_object_drops-GUC-for-DROP-TABLE-DATABASE-.patch === patching file contrib/postgres_fdw/connection.c patching file contrib/sepgsql/label.c patching file doc/src/sgml/config.sgml Hunk #1 succeeded at 7701 (offset 14 lines). patching file src/backend/access/transam/xact.c Hunk #9 succeeded at 2574 (offset 1 line). Hunk #10 succeeded at 2734 (offset 1 line). Hunk #11 succeeded at 2987 (offset 2 lines). Hunk #12 succeeded at 3864 (offset 4 lines). Hunk #13 succeeded at 3873 (offset 4 lines). patching file src/backend/catalog/dependency.c Hunk #4 succeeded at 1548 (offset 50 lines). patching file src/backend/commands/dbcommands.c patching file src/backend/utils/misc/guc_parameters.dat Hunk #1 succeeded at 3514 (offset 7 lines). patching file src/backend/utils/misc/guc_tables.c patching file src/include/access/xact.h patching file src/include/utils/guc.h patching file src/pl/plpgsql/src/pl_exec.c patching file src/pl/plpgsql/src/plpgsql.h patching file src/test/recovery/meson.build Hunk #1 FAILED at 57. 1 out of 1 hunk FAILED -- saving rejects to file src/test/recovery/meson.build.rej patching file src/test/recovery/t/050_drop_table_logging.pl Unstaged changes after reset: M contrib/postgres_fdw/connection.c M contrib/sepgsql/label.c M doc/src/sgml/config.sgml M src/backend/access/transam/xact.c M src/backend/catalog/dependency.c M src/backend/commands/dbcommands.c M src/backend/utils/misc/guc_parameters.dat M src/backend/utils/misc/guc_tables.c M src/include/access/xact.h M src/include/utils/guc.h M src/pl/plpgsql/src/pl_exec.c M src/pl/plpgsql/src/plpgsql.h Removing src/test/recovery/meson.build.rej Removing src/test/recovery/t/050_drop_table_logging.pl === using 'git apply' to apply patch ./v5-0001-Add-log_object_drops-GUC-for-DROP-TABLE-DATABASE-.patch === /work/patches/./v5-0001-Add-log_object_drops-GUC-for-DROP-TABLE-DATABASE-.patch:166: indent with spaces. XLogRecPtr commit_lsn = InvalidXLogRecPtr; /work/patches/./v5-0001-Add-log_object_drops-GUC-for-DROP-TABLE-DATABASE-.patch:330: indent with spaces. return; /work/patches/./v5-0001-Add-log_object_drops-GUC-for-DROP-TABLE-DATABASE-.patch:372: indent with spaces. return; Applied patch to 'contrib/postgres_fdw/connection.c' cleanly. Applied patch to 'contrib/sepgsql/label.c' cleanly. Applied patch to 'doc/src/sgml/config.sgml' cleanly. Applied patch to 'src/backend/access/transam/xact.c' cleanly. Applied patch to 'src/backend/catalog/dependency.c' cleanly. Applied patch to 'src/backend/commands/dbcommands.c' cleanly. Applied patch to 'src/backend/utils/misc/guc_parameters.dat' cleanly. Applied patch to 'src/backend/utils/misc/guc_tables.c' cleanly. Applied patch to 'src/include/access/xact.h' cleanly. Applied patch to 'src/include/utils/guc.h' cleanly. Applied patch to 'src/pl/plpgsql/src/pl_exec.c' cleanly. Applied patch to 'src/pl/plpgsql/src/plpgsql.h' cleanly. Applied patch to 'src/test/recovery/meson.build' with conflicts. Falling back to direct application... U src/test/recovery/meson.build warning: 3 lines add whitespace errors. diff --cc src/test/recovery/meson.build index 8d20488952e,8dbf76e3e5e..00000000000 --- a/src/test/recovery/meson.build +++ b/src/test/recovery/meson.build @@@ -57,9 -57,7 +57,13 @@@ tests += 't/046_checkpoint_logical_slot.pl', 't/047_checkpoint_physical_slot.pl', 't/048_vacuum_horizon_floor.pl', ++<<<<<<< ours + 't/049_wait_for_lsn.pl', + 't/050_redo_segment_missing.pl', + 't/051_effective_wal_level.pl', ++======= + 't/050_drop_table_logging.pl', ++>>>>>>> theirs ], }, }