=== Applying patches on top of PostgreSQL commit ID 06473f5a344df8c9594ead90a609b86f6724cff8 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Mon Sep  8 02:01:21 UTC 2025
On branch cf/5941
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v6-0001-error-safe-for-casting-bytea-to-other-types-per-pg_cast.patch ===
Applying: error safe for casting bytea to other types per pg_cast
=== using 'git am' to apply patch ./v6-0002-error-safe-for-casting-character-to-other-types-per-pg_ca.patch ===
Applying: error safe for casting character to other types per pg_cast
=== using 'git am' to apply patch ./v6-0003-error-safe-for-casting-integer-to-other-types-per-pg_cast.patch ===
Applying: error safe for casting integer to other types per pg_cast
=== using 'git am' to apply patch ./v6-0004-error-safe-for-casting-bigint-to-other-types-per-pg_cast.patch ===
Applying: error safe for casting bigint to other types per pg_cast
=== using 'git am' to apply patch ./v6-0005-error-safe-for-casting-numeric-to-other-types-per-pg_cast.patch ===
Applying: error safe for casting numeric to other types per pg_cast
Using index info to reconstruct a base tree...
M	src/backend/utils/adt/numeric.c
Falling back to patching base and 3-way merge...
Auto-merging src/backend/utils/adt/numeric.c
CONFLICT (content): Merge conflict in src/backend/utils/adt/numeric.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 error safe for casting numeric to other types per pg_cast
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/utils/adt/numeric.c
=== using patch(1) to apply patch ./v6-0005-error-safe-for-casting-numeric-to-other-types-per-pg_cast.patch ===
patching file src/backend/utils/adt/numeric.c
Hunk #1 succeeded at 1244 (offset -15 lines).
Hunk #2 succeeded at 1296 (offset -15 lines).
Hunk #3 FAILED at 4552.
Hunk #4 FAILED at 4640.
Hunk #5 succeeded at 4491 (offset -173 lines).
Hunk #6 succeeded at 4504 (offset -173 lines).
Hunk #7 succeeded at 4574 (offset -173 lines).
Hunk #8 succeeded at 4673 (offset -173 lines).
2 out of 8 hunks FAILED -- saving rejects to file src/backend/utils/adt/numeric.c.rej
Unstaged changes after reset:
M	src/backend/utils/adt/numeric.c
Removing src/backend/utils/adt/numeric.c.rej
=== using 'git apply' to apply patch ./v6-0005-error-safe-for-casting-numeric-to-other-types-per-pg_cast.patch ===
Applied patch to 'src/backend/utils/adt/numeric.c' with conflicts.
U src/backend/utils/adt/numeric.c
diff --cc src/backend/utils/adt/numeric.c
index 76269918593,2ab26d59e41..00000000000
--- a/src/backend/utils/adt/numeric.c
+++ b/src/backend/utils/adt/numeric.c
@@@ -4395,7 -4552,22 +4397,26 @@@ numeric_int4(PG_FUNCTION_ARGS
  {
  	Numeric		num = PG_GETARG_NUMERIC(0);
  
++<<<<<<< ours
 +	PG_RETURN_INT32(numeric_int4_safe(num, NULL));
++=======
+ 	if (likely(!fcinfo->context))
+ 		PG_RETURN_INT32(numeric_int4_opt_error(num, NULL));
+ 	else
+ 	{
+ 		bool	has_error;
+ 		int32	result;
+ 		Node	*escontext = fcinfo->context;
+ 
+ 		result = numeric_int4_opt_error(num, &has_error);
+ 		if (has_error)
+ 			ereturn(escontext, (Datum) 0,
+ 					errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
+ 					errmsg("integer out of range"));
+ 
+ 		PG_RETURN_INT32(result);
+ 	}
++>>>>>>> theirs
  }
  
  /*
@@@ -4465,7 -4655,22 +4486,26 @@@ numeric_int8(PG_FUNCTION_ARGS
  {
  	Numeric		num = PG_GETARG_NUMERIC(0);
  
++<<<<<<< ours
 +	PG_RETURN_INT64(numeric_int8_safe(num, NULL));
++=======
+ 	if (likely(!fcinfo->context))
+ 		PG_RETURN_INT64(numeric_int8_opt_error(num, NULL));
+ 	else
+ 	{
+ 		bool	has_error;
+ 		int64	result;
+ 		Node	*escontext = fcinfo->context;
+ 
+ 		result = numeric_int8_opt_error(num, &has_error);
+ 		if (has_error)
+ 			ereturn(escontext, (Datum) 0,
+ 					errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
+ 					errmsg("bigint out of range"));
+ 
+ 		PG_RETURN_INT64(result);
+ 	}
++>>>>>>> theirs
  }