=== Applying patches on top of PostgreSQL commit ID 6831cd9e3b082d7b830c3196742dd49e3540c49b ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sat Jan 17 14:20:21 UTC 2026
On branch cf/6188
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v1-0001-Report-oldest-xmin-source-when-autovacuum-cannot-.patch ===
Applying: Report oldest xmin source when autovacuum cannot remove tuples
Using index info to reconstruct a base tree...
M	src/backend/access/heap/vacuumlazy.c
M	src/backend/commands/vacuum.c
M	src/backend/storage/ipc/procarray.c
M	src/include/commands/vacuum.h
M	src/include/storage/procarray.h
M	src/test/modules/test_misc/meson.build
Falling back to patching base and 3-way merge...
Auto-merging src/test/modules/test_misc/meson.build
CONFLICT (content): Merge conflict in src/test/modules/test_misc/meson.build
Auto-merging src/include/storage/procarray.h
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/access/heap/vacuumlazy.c
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 oldest xmin source when autovacuum cannot remove tuples
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".
Unstaged changes after reset:
M	src/backend/access/heap/vacuumlazy.c
M	src/backend/commands/vacuum.c
M	src/backend/storage/ipc/procarray.c
M	src/include/commands/vacuum.h
M	src/include/storage/procarray.h
M	src/test/modules/test_misc/meson.build
Removing src/test/modules/test_misc/t/010_autovacuum_oldest_xmin_reason.pl
=== using patch(1) to apply patch ./v1-0001-Report-oldest-xmin-source-when-autovacuum-cannot-.patch ===
patching file src/backend/access/heap/vacuumlazy.c
Hunk #1 succeeded at 1071 (offset 24 lines).
patching file src/backend/commands/vacuum.c
Hunk #1 succeeded at 1133 (offset 3 lines).
patching file src/backend/storage/ipc/procarray.c
Hunk #1 succeeded at 243 (offset 2 lines).
Hunk #2 succeeded at 1630 (offset 2 lines).
Hunk #3 succeeded at 1737 (offset 2 lines).
Hunk #4 succeeded at 1760 (offset 2 lines).
Hunk #5 succeeded at 1778 (offset 2 lines).
Hunk #6 succeeded at 1806 (offset 2 lines).
Hunk #7 succeeded at 1832 (offset 2 lines).
Hunk #8 succeeded at 1844 (offset 2 lines).
Hunk #9 succeeded at 1880 (offset 2 lines).
Hunk #10 succeeded at 1901 (offset 2 lines).
Hunk #11 succeeded at 1920 (offset 2 lines).
Hunk #12 succeeded at 1935 (offset 2 lines).
Hunk #13 succeeded at 2032 (offset 2 lines).
patching file src/include/commands/vacuum.h
patching file src/include/storage/procarray.h
patching file src/test/modules/test_misc/meson.build
Hunk #1 FAILED at 18.
1 out of 1 hunk FAILED -- saving rejects to file src/test/modules/test_misc/meson.build.rej
patching file src/test/modules/test_misc/t/010_autovacuum_oldest_xmin_reason.pl
Unstaged changes after reset:
M	src/backend/access/heap/vacuumlazy.c
M	src/backend/commands/vacuum.c
M	src/backend/storage/ipc/procarray.c
M	src/include/commands/vacuum.h
M	src/include/storage/procarray.h
Removing src/test/modules/test_misc/meson.build.rej
Removing src/test/modules/test_misc/t/010_autovacuum_oldest_xmin_reason.pl
=== using 'git apply' to apply patch ./v1-0001-Report-oldest-xmin-source-when-autovacuum-cannot-.patch ===
Applied patch to 'src/backend/access/heap/vacuumlazy.c' 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/vacuum.h' cleanly.
Applied patch to 'src/include/storage/procarray.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
diff --cc src/test/modules/test_misc/meson.build
index 6e8db1621a7,b42fed91184..00000000000
--- a/src/test/modules/test_misc/meson.build
+++ b/src/test/modules/test_misc/meson.build
@@@ -18,9 -18,7 +18,13 @@@ tests += 
        't/007_catcache_inval.pl',
        't/008_replslot_single_user.pl',
        't/009_log_temp_files.pl',
++<<<<<<< ours
 +      't/010_index_concurrently_upsert.pl',
++=======
+       't/010_autovacuum_oldest_xmin_reason.pl',
++>>>>>>> theirs
      ],
 +    # The injection points are cluster-wide, so disable installcheck
 +    'runningcheck': false,
    },
  }