=== Applying patches on top of PostgreSQL commit ID 89eafad297a9b01ad77cfc1ab93a433e0af894b0 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sat Jun  6 15:35:24 UTC 2026
On branch cf/6725
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v2-0001-Improve-overflow-underflow-handling-in-regr_r2.patch ===
Applying: Improve overflow/underflow handling in regr_r2().
Using index info to reconstruct a base tree...
M	src/backend/utils/adt/float.c
M	src/test/regress/expected/aggregates.out
M	src/test/regress/sql/aggregates.sql
Falling back to patching base and 3-way merge...
Auto-merging src/test/regress/sql/aggregates.sql
CONFLICT (content): Merge conflict in src/test/regress/sql/aggregates.sql
Auto-merging src/test/regress/expected/aggregates.out
CONFLICT (content): Merge conflict in src/test/regress/expected/aggregates.out
Auto-merging src/backend/utils/adt/float.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 Improve overflow/underflow handling in regr_r2().
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 ./v2-0001-Improve-overflow-underflow-handling-in-regr_r2.patch ===
patching file src/backend/utils/adt/float.c
Hunk #1 FAILED at 3916.
Hunk #2 FAILED at 3938.
2 out of 2 hunks FAILED -- saving rejects to file src/backend/utils/adt/float.c.rej
patching file src/test/regress/expected/aggregates.out
Hunk #1 FAILED at 516.
Hunk #2 FAILED at 537.
2 out of 2 hunks FAILED -- saving rejects to file src/test/regress/expected/aggregates.out.rej
patching file src/test/regress/sql/aggregates.sql
Hunk #1 FAILED at 141.
1 out of 1 hunk FAILED -- saving rejects to file src/test/regress/sql/aggregates.sql.rej
Removing src/backend/utils/adt/float.c.rej
Removing src/test/regress/expected/aggregates.out.rej
Removing src/test/regress/sql/aggregates.sql.rej
=== using 'git apply' to apply patch ./v2-0001-Improve-overflow-underflow-handling-in-regr_r2.patch ===
Applied patch to 'src/backend/utils/adt/float.c' cleanly.
Applied patch to 'src/test/regress/expected/aggregates.out' with conflicts.
Applied patch to 'src/test/regress/sql/aggregates.sql' with conflicts.
U src/test/regress/expected/aggregates.out
U src/test/regress/sql/aggregates.sql
diff --cc src/test/regress/expected/aggregates.out
index 89e051ee824,1ccdf7dfdd7..00000000000
--- a/src/test/regress/expected/aggregates.out
+++ b/src/test/regress/expected/aggregates.out
@@@ -561,18 -561,6 +561,21 @@@ SELECT corr(1e100 + g * 1e95, 1e100 + 
   corr | regr_r2 
  ------+---------
      1 |       1
++<<<<<<< ours
 +(1 row)
 +
 +SELECT regr_intercept(y, x) FROM (VALUES (-1e150, 0), (2e150, 3e150)) v(x, y);
 + regr_intercept 
 +----------------
 +         1e+150
 +(1 row)
 +
 +SELECT regr_intercept(y, x) FROM (VALUES (-1e-131, 0), (2e-131, 3e-131)) v(x, y);
 + regr_intercept 
 +----------------
 +         1e-131
++=======
++>>>>>>> theirs
  (1 row)
  
  -- these examples pose definitional questions for NaN inputs,
diff --cc src/test/regress/sql/aggregates.sql
index 916383db927,a310b39e7b8..00000000000
--- a/src/test/regress/sql/aggregates.sql
+++ b/src/test/regress/sql/aggregates.sql
@@@ -159,8 -159,6 +159,11 @@@ SELECT corr(1e-100 + g * 1e-105, 1e-10
  SELECT corr(1e100 + g * 1e95, 1e100 + g * 1e95),
         regr_r2(1e100 + g * 1e95, 1e100 + g * 1e95)
    FROM generate_series(1, 2) g;
++<<<<<<< ours
 +SELECT regr_intercept(y, x) FROM (VALUES (-1e150, 0), (2e150, 3e150)) v(x, y);
 +SELECT regr_intercept(y, x) FROM (VALUES (-1e-131, 0), (2e-131, 3e-131)) v(x, y);
++=======
++>>>>>>> theirs
  
  -- these examples pose definitional questions for NaN inputs,
  -- which we resolve by saying that an all-NaN input column is not all equal