=== Applying patches on top of PostgreSQL commit ID 53a49365052026907afff7613929710d1e7f0da0 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Sat Feb 1 04:39:30 UTC 2025 On branch cf/5327 nothing to commit, working tree clean === applying patch ./v8-0001-Prototype-B-tree-vacuum-streamlineing.patch Applied patch to 'src/backend/access/nbtree/nbtree.c' cleanly. Applied patch to 'src/test/modules/test_misc/meson.build' with conflicts. Falling back to direct application... U src/test/modules/test_misc/meson.build diff --cc src/test/modules/test_misc/meson.build index 9c50de7efb,a456a5e77f..0000000000 --- a/src/test/modules/test_misc/meson.build +++ b/src/test/modules/test_misc/meson.build @@@ -15,7 -15,7 +15,11 @@@ tests += 't/004_io_direct.pl', 't/005_timeouts.pl', 't/006_signal_autovacuum.pl', ++<<<<<<< ours + 't/007_catcache_inval.pl', ++======= + 't/007_vacuum_btree.pl', ++>>>>>>> theirs ], }, }