=== Applying patches on top of PostgreSQL commit ID ff30bad7f6f085598e61bb06a8433cb33b3400c7 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sat Dec 13 16:22:19 UTC 2025
On branch cf/5007
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v7-0001-Add-stats-tests-related-to-rewrite.patch ===
Applying: Add stats tests related to rewrite
=== using 'git am' to apply patch ./v7-0002-Key-PGSTAT_KIND_RELATION-by-relfile-locator.patch ===
Applying: Key PGSTAT_KIND_RELATION by relfile locator
Using index info to reconstruct a base tree...
M	src/backend/access/heap/vacuumlazy.c
M	src/backend/postmaster/autovacuum.c
M	src/backend/utils/activity/pgstat_relation.c
M	src/backend/utils/adt/pgstatfuncs.c
M	src/include/pgstat.h
M	src/include/utils/pgstat_internal.h
Falling back to patching base and 3-way merge...
Auto-merging src/include/utils/pgstat_internal.h
Auto-merging src/include/pgstat.h
CONFLICT (content): Merge conflict in src/include/pgstat.h
Auto-merging src/backend/utils/adt/pgstatfuncs.c
Auto-merging src/backend/utils/activity/pgstat_relation.c
Auto-merging src/backend/postmaster/autovacuum.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 Key PGSTAT_KIND_RELATION by relfile locator
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/postmaster/autovacuum.c
M	src/backend/utils/activity/pgstat_relation.c
M	src/backend/utils/adt/pgstatfuncs.c
M	src/include/pgstat.h
M	src/include/utils/pgstat_internal.h
M	src/test/recovery/t/029_stats_restart.pl
=== using patch(1) to apply patch ./v7-0002-Key-PGSTAT_KIND_RELATION-by-relfile-locator.patch ===
patching file src/backend/access/heap/vacuumlazy.c
Hunk #1 succeeded at 961 (offset 14 lines).
patching file src/backend/postmaster/autovacuum.c
patching file src/backend/utils/activity/pgstat_relation.c
Hunk #14 succeeded at 565 with fuzz 1.
patching file src/backend/utils/adt/pgstatfuncs.c
Hunk #3 succeeded at 2310 (offset 15 lines).
patching file src/include/pgstat.h
Hunk #1 FAILED at 16.
Hunk #2 succeeded at 35 (offset 1 line).
Hunk #3 succeeded at 181 (offset 2 lines).
Hunk #4 succeeded at 675 (offset 5 lines).
Hunk #5 succeeded at 741 (offset 5 lines).
1 out of 5 hunks FAILED -- saving rejects to file src/include/pgstat.h.rej
patching file src/include/utils/pgstat_internal.h
patching file src/test/recovery/t/029_stats_restart.pl
Unstaged changes after reset:
M	src/backend/access/heap/vacuumlazy.c
M	src/backend/postmaster/autovacuum.c
M	src/backend/utils/activity/pgstat_relation.c
M	src/backend/utils/adt/pgstatfuncs.c
M	src/include/pgstat.h
M	src/include/utils/pgstat_internal.h
M	src/test/recovery/t/029_stats_restart.pl
Removing src/include/pgstat.h.rej
=== using 'git apply' to apply patch ./v7-0002-Key-PGSTAT_KIND_RELATION-by-relfile-locator.patch ===
Applied patch to 'src/backend/access/heap/vacuumlazy.c' cleanly.
Applied patch to 'src/backend/postmaster/autovacuum.c' 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/pgstat.h' with conflicts.
Applied patch to 'src/include/utils/pgstat_internal.h' cleanly.
Applied patch to 'src/test/recovery/t/029_stats_restart.pl' cleanly.
U src/include/pgstat.h
diff --cc src/include/pgstat.h
index f23dd5870da,5d0fe79f7e3..00000000000
--- a/src/include/pgstat.h
+++ b/src/include/pgstat.h
@@@ -16,7 -16,7 +16,11 @@@
  #include "portability/instr_time.h"
  #include "postmaster/pgarch.h"	/* for MAX_XFN_CHARS */
  #include "replication/conflict.h"
++<<<<<<< ours
 +#include "replication/worker_internal.h"
++=======
+ #include "storage/relfilelocator.h"
++>>>>>>> theirs
  #include "utils/backend_progress.h" /* for backward compatibility */	/* IWYU pragma: export */
  #include "utils/backend_status.h"	/* for backward compatibility */	/* IWYU pragma: export */
  #include "utils/pgstat_kind.h"