=== Applying patches on top of PostgreSQL commit ID 745becce3321267a4530af286433d1dc6f043360 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Fri Jul 31 05:38:38 UTC 2026
On branch cf/5012
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v42-0001-Report-per-index-removed-tuples-in-vacuum-instru.patch ===
Applying: Report per-index removed tuples in vacuum instrumentation.
=== using 'git am' to apply patch ./v42-0002-Track-vacuum-times-for-indexes-and-databases-and.patch ===
Applying: Track vacuum times for indexes and databases, and vacuum delay, in pg_stat views.
=== using 'git am' to apply patch ./v42-0003-Count-wraparound-failsafe-vacuums-in-pg_stat-vie.patch ===
Applying: Count wraparound-failsafe vacuums in pg_stat views.
=== using 'git am' to apply patch ./v42-0004-Count-vacuums-interrupted-by-errors-in-pg_stat_d.patch ===
Applying: Count vacuums interrupted by errors in pg_stat_database.
=== using 'git am' to apply patch ./v42-0005-Vacuum-report-hook-and-the-ext_vacuum_statistics.patch ===
Applying: Vacuum report hook and the ext_vacuum_statistics extension.
=== using 'git am' to apply patch ./v42-0006-ext_vacuum_statistics-page-counters-for-tables-a.patch ===
Applying: ext_vacuum_statistics: page counters for tables and indexes.
=== using 'git am' to apply patch ./v42-0007-ext_vacuum_statistics-WAL-metrics-and-the-per-da.patch ===
Applying: ext_vacuum_statistics: WAL metrics and the per-database aggregate.
=== using 'git am' to apply patch ./v42-0008-ext_vacuum_statistics-shared-buffer-access-count.patch ===
Applying: ext_vacuum_statistics: shared-buffer access counters and I/O timing.
=== using 'git am' to apply patch ./v42-0009-Track-table-VM-stability.patch ===
Applying: Track table VM stability.
error: sha1 information is lacking or useless (doc/src/sgml/monitoring.sgml).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Track table VM stability.
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 ./v42-0009-Track-table-VM-stability.patch ===
patching file doc/src/sgml/monitoring.sgml
Hunk #1 succeeded at 4777 (offset 153 lines).
patching file src/backend/access/heap/visibilitymap.c
Hunk #2 succeeded at 181 (offset 7 lines).
patching file src/backend/catalog/system_views.sql
patching file src/backend/utils/activity/pgstat_relation.c
patching file src/backend/utils/adt/pgstatfuncs.c
patching file src/include/catalog/pg_proc.dat
Hunk #1 succeeded at 12753 (offset -3 lines).
patching file src/include/pgstat.h
patching file src/test/isolation/expected/vacuum-extending-freeze.out
patching file src/test/isolation/isolation_schedule
Hunk #1 FAILED at 128.
1 out of 1 hunk FAILED -- saving rejects to file src/test/isolation/isolation_schedule.rej
patching file src/test/isolation/specs/vacuum-extending-freeze.spec
patching file src/test/regress/expected/rules.out
Unstaged changes after reset:
M	doc/src/sgml/monitoring.sgml
M	src/backend/access/heap/visibilitymap.c
M	src/backend/catalog/system_views.sql
M	src/backend/utils/activity/pgstat_relation.c
M	src/backend/utils/adt/pgstatfuncs.c
M	src/include/catalog/pg_proc.dat
M	src/include/pgstat.h
M	src/test/regress/expected/rules.out
Removing src/test/isolation/expected/vacuum-extending-freeze.out
Removing src/test/isolation/isolation_schedule.rej
Removing src/test/isolation/specs/vacuum-extending-freeze.spec
=== using 'git apply' to apply patch ./v42-0009-Track-table-VM-stability.patch ===
error: repository lacks the necessary blob to perform 3-way merge.
Falling back to direct application...
Applied patch to 'src/backend/access/heap/visibilitymap.c' cleanly.
Applied patch to 'src/backend/catalog/system_views.sql' cleanly.
Applied patch to 'src/backend/utils/activity/pgstat_relation.c' cleanly.
Applied patch to 'src/backend/utils/adt/pgstatfuncs.c' cleanly.
error: repository lacks the necessary blob to perform 3-way merge.
Falling back to direct application...
Applied patch to 'src/include/pgstat.h' cleanly.
Falling back to direct application...
Applied patch to 'src/test/isolation/isolation_schedule' with conflicts.
Falling back to direct application...
Applied patch to 'src/test/regress/expected/rules.out' cleanly.
U src/test/isolation/isolation_schedule
diff --cc src/test/isolation/isolation_schedule
index 26abed9f9f0,2c27b3eef67..00000000000
--- a/src/test/isolation/isolation_schedule
+++ b/src/test/isolation/isolation_schedule
@@@ -128,4 -128,4 +128,8 @@@ test: matview-write-ske
  test: lock-nowait
  test: for-portion-of
  test: ddl-dependency-locking
++<<<<<<< ours
 +test: pub-concurrent-drop
++=======
+ test: vacuum-extending-freeze
++>>>>>>> theirs