=== Applying patches on top of PostgreSQL commit ID 41625ab8ea3d0a2656dd0f067f1f0b61df63af97 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Fri Feb 21 02:39:24 UTC 2025
On branch cf/5550
nothing to commit, working tree clean
=== applying patch ./v2-0001-Implement-WAIT-FOR-command.patch
Applied patch to 'doc/src/sgml/ref/allfiles.sgml' cleanly.
Applied patch to 'doc/src/sgml/reference.sgml' cleanly.
Applied patch to 'src/backend/access/transam/Makefile' cleanly.
Applied patch to 'src/backend/access/transam/meson.build' cleanly.
Applied patch to 'src/backend/access/transam/xact.c' cleanly.
Applied patch to 'src/backend/access/transam/xlog.c' cleanly.
Applied patch to 'src/backend/access/transam/xlogrecovery.c' cleanly.
Falling back to direct application...
Applied patch to 'src/backend/commands/Makefile' cleanly.
Applied patch to 'src/backend/commands/meson.build' cleanly.
Falling back to direct application...
Applied patch to 'src/backend/lib/pairingheap.c' cleanly.
Applied patch to 'src/backend/parser/gram.y' cleanly.
Applied patch to 'src/backend/storage/ipc/ipci.c' cleanly.
Applied patch to 'src/backend/storage/lmgr/proc.c' cleanly.
Applied patch to 'src/backend/tcop/pquery.c' cleanly.
Applied patch to 'src/backend/tcop/utility.c' cleanly.
Applied patch to 'src/backend/utils/activity/wait_event_names.txt' cleanly.
Falling back to direct application...
Falling back to direct application...
Applied patch to 'src/include/lib/pairingheap.h' cleanly.
Applied patch to 'src/include/nodes/parsenodes.h' cleanly.
Applied patch to 'src/include/parser/kwlist.h' cleanly.
Applied patch to 'src/include/storage/lwlocklist.h' cleanly.
Applied patch to 'src/include/tcop/cmdtaglist.h' cleanly.
Applied patch to 'src/test/recovery/meson.build' with conflicts.
Falling back to direct application...
Applied patch to 'src/tools/pgindent/typedefs.list' cleanly.
U src/test/recovery/meson.build
diff --cc src/test/recovery/meson.build
index 057bcde143,52ec036e27..0000000000
--- a/src/test/recovery/meson.build
+++ b/src/test/recovery/meson.build
@@@ -52,7 -52,7 +52,11 @@@ tests += 
        't/041_checkpoint_at_promote.pl',
        't/042_low_level_backup.pl',
        't/043_no_contrecord_switch.pl',
++<<<<<<< ours
 +      't/044_invalidate_inactive_slots.pl',
++=======
+       't/044_wait_for_lsn.pl',
++>>>>>>> theirs
      ],
    },
  }