=== Applying patches on top of PostgreSQL commit ID bdaad789c843f57b1fc66c5ede7abaff8a915c3b ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Thu Aug 13 01:22:27 UTC 2026
On branch cf/6188
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v1-0001-Report-what-holds-back-the-oldest-xmin-horizon-du.patch ===
Applying: Report what holds back the oldest xmin horizon during VACUUM
Using index info to reconstruct a base tree...
M	doc/src/sgml/monitoring.sgml
M	src/backend/access/heap/vacuumlazy.c
M	src/backend/catalog/system_views.sql
M	src/backend/commands/vacuum.c
M	src/backend/storage/ipc/procarray.c
M	src/include/commands/vacuum.h
M	src/test/recovery/meson.build
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/test/recovery/meson.build
CONFLICT (content): Merge conflict in src/test/recovery/meson.build
Auto-merging src/include/commands/vacuum.h
Auto-merging src/backend/storage/ipc/procarray.c
Auto-merging src/backend/commands/vacuum.c
Auto-merging src/backend/catalog/system_views.sql
Auto-merging src/backend/access/heap/vacuumlazy.c
Auto-merging doc/src/sgml/monitoring.sgml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Report what holds back the oldest xmin horizon during VACUUM
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".
=== using patch(1) to apply patch ./v1-0001-Report-what-holds-back-the-oldest-xmin-horizon-du.patch ===
patching file doc/src/sgml/monitoring.sgml
Hunk #1 succeeded at 7910 (offset 173 lines).
patching file src/backend/access/heap/vacuumlazy.c
patching file src/backend/catalog/system_views.sql
patching file src/backend/commands/vacuum.c
Hunk #2 succeeded at 1182 (offset 18 lines).
Hunk #3 succeeded at 1213 (offset 18 lines).
patching file src/backend/storage/ipc/procarray.c
patching file src/include/commands/progress.h
patching file src/include/commands/vacuum.h
patching file src/include/storage/procarray.h
patching file src/test/recovery/meson.build
Hunk #1 FAILED at 63.
1 out of 1 hunk FAILED -- saving rejects to file src/test/recovery/meson.build.rej
patching file src/test/recovery/t/055_vacuum_oldest_xmin_blocker.pl
patching file src/test/regress/expected/rules.out
patching file src/tools/pgindent/typedefs.list
Hunk #2 succeeded at 3553 (offset 3 lines).
Unstaged changes after reset:
M	doc/src/sgml/monitoring.sgml
M	src/backend/access/heap/vacuumlazy.c
M	src/backend/catalog/system_views.sql
M	src/backend/commands/vacuum.c
M	src/backend/storage/ipc/procarray.c
M	src/include/commands/progress.h
M	src/include/commands/vacuum.h
M	src/include/storage/procarray.h
M	src/test/regress/expected/rules.out
M	src/tools/pgindent/typedefs.list
Removing src/test/recovery/meson.build.rej
Removing src/test/recovery/t/055_vacuum_oldest_xmin_blocker.pl
=== using 'git apply' to apply patch ./v1-0001-Report-what-holds-back-the-oldest-xmin-horizon-du.patch ===
Applied patch to 'doc/src/sgml/monitoring.sgml' cleanly.
Applied patch to 'src/backend/access/heap/vacuumlazy.c' cleanly.
Applied patch to 'src/backend/catalog/system_views.sql' cleanly.
Applied patch to 'src/backend/commands/vacuum.c' cleanly.
Applied patch to 'src/backend/storage/ipc/procarray.c' cleanly.
Applied patch to 'src/include/commands/progress.h' cleanly.
Applied patch to 'src/include/commands/vacuum.h' cleanly.
Applied patch to 'src/include/storage/procarray.h' cleanly.
Applied patch to 'src/test/recovery/meson.build' with conflicts.
Falling back to direct application...
Applied patch to 'src/test/regress/expected/rules.out' cleanly.
Applied patch to 'src/tools/pgindent/typedefs.list' cleanly.
U src/test/recovery/meson.build
diff --cc src/test/recovery/meson.build
index 39ec8c4946d,eb9d55383e0..00000000000
--- a/src/test/recovery/meson.build
+++ b/src/test/recovery/meson.build
@@@ -63,7 -63,7 +63,11 @@@ tests += 
        't/052_checkpoint_segment_missing.pl',
        't/053_standby_login_event_trigger.pl',
        't/054_unlogged_sequence_promotion.pl',
++<<<<<<< ours
 +      't/055_cascade_reconnect.pl',
++=======
+       't/055_vacuum_oldest_xmin_blocker.pl',
++>>>>>>> theirs
      ],
    },
  }