=== Applying patches on top of PostgreSQL commit ID a78cf591a3f5288aa5ae96902a36e342a3178b79 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sun Apr 12 20:25:30 UTC 2026
On branch cf/5012
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v36-0001-Track-table-VM-stability.patch ===
Applying: Track table VM stability.
Using index info to reconstruct a base tree...
M	doc/src/sgml/monitoring.sgml
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/isolation/isolation_schedule
M	src/test/regress/expected/rules.out
Falling back to patching base and 3-way merge...
Auto-merging src/test/regress/expected/rules.out
Auto-merging src/test/isolation/isolation_schedule
CONFLICT (content): Merge conflict in src/test/isolation/isolation_schedule
Auto-merging src/include/pgstat.h
Auto-merging src/include/catalog/pg_proc.dat
Auto-merging src/backend/utils/adt/pgstatfuncs.c
Auto-merging src/backend/utils/activity/pgstat_relation.c
Auto-merging src/backend/catalog/system_views.sql
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 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 ./v36-0001-Track-table-VM-stability.patch ===
patching file doc/src/sgml/monitoring.sgml
Hunk #1 succeeded at 4377 (offset 15 lines).
patching file src/backend/access/heap/visibilitymap.c
patching file src/backend/catalog/system_views.sql
patching file src/backend/utils/activity/pgstat_relation.c
Hunk #1 succeeded at 881 (offset 2 lines).
patching file src/backend/utils/adt/pgstatfuncs.c
patching file src/include/catalog/pg_proc.dat
Hunk #1 succeeded at 12769 (offset -82 lines).
patching file src/include/pgstat.h
Hunk #4 succeeded at 753 (offset -4 lines).
patching file src/test/isolation/expected/vacuum-extending-freeze.out
patching file src/test/isolation/isolation_schedule
Hunk #1 FAILED at 124.
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
Hunk #2 succeeded at 2359 (offset 53 lines).
Hunk #3 succeeded at 2416 (offset 53 lines).
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 ./v36-0001-Track-table-VM-stability.patch ===
Applied patch to 'doc/src/sgml/monitoring.sgml' cleanly.
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.
Applied patch to 'src/include/catalog/pg_proc.dat' cleanly.
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 1578ba191c8,81e68f85d88..00000000000
--- a/src/test/isolation/isolation_schedule
+++ b/src/test/isolation/isolation_schedule
@@@ -125,4 -124,4 +125,8 @@@ test: serializable-parallel-
  test: serializable-parallel-3
  test: matview-write-skew
  test: lock-nowait
++<<<<<<< ours
 +test: for-portion-of
++=======
+ test: vacuum-extending-freeze
++>>>>>>> theirs