=== Applying patches on top of PostgreSQL commit ID a14041d437ff9e74d3596aea31bd202662e28800 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Tue Oct  6 17:28:32 UTC 2026
On branch cf/6978
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v2-0001-Avoid-internal-error-for-invalid-interval-typmods.patch ===
Applying: Avoid internal error for invalid interval typmods
Using index info to reconstruct a base tree...
M	src/backend/utils/adt/timestamp.c
Falling back to patching base and 3-way merge...
Auto-merging src/backend/utils/adt/timestamp.c
CONFLICT (content): Merge conflict in src/backend/utils/adt/timestamp.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 Avoid internal error for invalid interval typmods
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-Avoid-internal-error-for-invalid-interval-typmods.patch ===
patching file src/backend/utils/adt/timestamp.c
Hunk #1 FAILED at 1489.
1 out of 1 hunk FAILED -- saving rejects to file src/backend/utils/adt/timestamp.c.rej
patching file src/test/regress/expected/interval.out
patching file src/test/regress/sql/interval.sql
Unstaged changes after reset:
M	src/test/regress/expected/interval.out
M	src/test/regress/sql/interval.sql
Removing src/backend/utils/adt/timestamp.c.rej
=== using 'git apply' to apply patch ./v2-0001-Avoid-internal-error-for-invalid-interval-typmods.patch ===
Applied patch to 'src/backend/utils/adt/timestamp.c' with conflicts.
Applied patch to 'src/test/regress/expected/interval.out' cleanly.
Applied patch to 'src/test/regress/sql/interval.sql' cleanly.
U src/backend/utils/adt/timestamp.c
diff --cc src/backend/utils/adt/timestamp.c
index 43efa548452,01b9ed5247b..00000000000
--- a/src/backend/utils/adt/timestamp.c
+++ b/src/backend/utils/adt/timestamp.c
@@@ -1493,7 -1489,7 +1493,11 @@@ AdjustIntervalForTypmod(Interval *inter
  			/* fractional-second rounding will be dealt with below */
  		}
  		else
++<<<<<<< ours
 +			ereport(ERROR,
++=======
+ 			ereturn(escontext, false,
++>>>>>>> theirs
  					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
  					 errmsg("unrecognized interval typmod: %d", typmod)));