=== 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 07:05:27 UTC 2025
On branch cf/5151
nothing to commit, working tree clean
=== applying patch ./v4-0001-Fix-possible-lost-tuples-in-non-MVCC-index-scans-.patch
/work/patches/./v4-0001-Fix-possible-lost-tuples-in-non-MVCC-index-scans-.patch:299: space before tab in indent.
 	 * of the scan. Aso reset maxXmax.
/work/patches/./v4-0001-Fix-possible-lost-tuples-in-non-MVCC-index-scans-.patch:300: space before tab in indent.
 	 */
Applied patch to 'contrib/pgstattuple/pgstattuple.c' cleanly.
Applied patch to 'src/backend/access/heap/heapam_handler.c' cleanly.
Applied patch to 'src/backend/access/heap/heapam_visibility.c' cleanly.
Applied patch to 'src/backend/access/nbtree/README' cleanly.
Applied patch to 'src/backend/access/nbtree/nbtinsert.c' cleanly.
Applied patch to 'src/backend/access/transam/varsup.c' cleanly.
Applied patch to 'src/backend/executor/execIndexing.c' cleanly.
Applied patch to 'src/backend/executor/execReplication.c' cleanly.
Applied patch to 'src/backend/replication/logical/origin.c' cleanly.
Applied patch to 'src/include/access/transam.h' cleanly.
Applied patch to 'src/include/utils/snapmgr.h' cleanly.
Applied patch to 'src/include/utils/snapshot.h' 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
warning: 2 lines add whitespace errors.
diff --cc src/test/modules/test_misc/meson.build
index 9c50de7efb,31f7901bdd..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_dirty_index_scan.pl',
++>>>>>>> theirs
      ],
    },
  }