=== Applying patches on top of PostgreSQL commit ID 5f14f82280db4b0e49d774362854c9d362106484 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sat Jul 11 13:36:27 UTC 2026
On branch cf/6880
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v3-0001-Fix-ANALYZE-reporting-after-imported-foreign-tabl.patch ===
Applying: Fix ANALYZE reporting after imported foreign-table stats
Using index info to reconstruct a base tree...
M	contrib/postgres_fdw/expected/postgres_fdw.out
M	contrib/postgres_fdw/postgres_fdw.c
M	contrib/postgres_fdw/sql/postgres_fdw.sql
Falling back to patching base and 3-way merge...
Auto-merging contrib/postgres_fdw/sql/postgres_fdw.sql
Auto-merging contrib/postgres_fdw/postgres_fdw.c
CONFLICT (content): Merge conflict in contrib/postgres_fdw/postgres_fdw.c
Auto-merging contrib/postgres_fdw/expected/postgres_fdw.out
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix ANALYZE reporting after imported foreign-table stats
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 ./v3-0001-Fix-ANALYZE-reporting-after-imported-foreign-tabl.patch ===
patching file contrib/postgres_fdw/expected/postgres_fdw.out
Hunk #1 FAILED at 12973.
Hunk #2 FAILED at 12988.
2 out of 2 hunks FAILED -- saving rejects to file contrib/postgres_fdw/expected/postgres_fdw.out.rej
patching file contrib/postgres_fdw/postgres_fdw.c
Hunk #1 FAILED at 41.
Hunk #2 FAILED at 52.
Hunk #3 FAILED at 336.
Hunk #4 FAILED at 5597.
Hunk #5 succeeded at 5537 with fuzz 2 (offset -119 lines).
Hunk #6 FAILED at 5667.
Hunk #7 succeeded at 5699 with fuzz 2 (offset -110 lines).
5 out of 7 hunks FAILED -- saving rejects to file contrib/postgres_fdw/postgres_fdw.c.rej
patching file contrib/postgres_fdw/sql/postgres_fdw.sql
Hunk #1 FAILED at 4587.
Hunk #2 FAILED at 4604.
2 out of 2 hunks FAILED -- saving rejects to file contrib/postgres_fdw/sql/postgres_fdw.sql.rej
Unstaged changes after reset:
M	contrib/postgres_fdw/postgres_fdw.c
Removing contrib/postgres_fdw/expected/postgres_fdw.out.rej
Removing contrib/postgres_fdw/postgres_fdw.c.rej
Removing contrib/postgres_fdw/sql/postgres_fdw.sql.rej
=== using 'git apply' to apply patch ./v3-0001-Fix-ANALYZE-reporting-after-imported-foreign-tabl.patch ===
Applied patch to 'contrib/postgres_fdw/expected/postgres_fdw.out' cleanly.
Applied patch to 'contrib/postgres_fdw/postgres_fdw.c' with conflicts.
Applied patch to 'contrib/postgres_fdw/sql/postgres_fdw.sql' cleanly.
U contrib/postgres_fdw/postgres_fdw.c
diff --cc contrib/postgres_fdw/postgres_fdw.c
index 70de942de12,e5917eb7449..00000000000
--- a/contrib/postgres_fdw/postgres_fdw.c
+++ b/contrib/postgres_fdw/postgres_fdw.c
@@@ -337,9 -337,9 +337,15 @@@ typedef struc
  {
  	PGresult   *rel;
  	PGresult   *att;
++<<<<<<< ours
 +	double		livetuples;
 +	double		deadtuples;
 +	int			version;
++=======
+ 	int			server_version_num;
+ 	double		livetuples;
+ 	double		deadtuples;
++>>>>>>> theirs
  } RemoteStatsResults;
  
  /* Column order in relation stats query */