=== Applying patches on top of PostgreSQL commit ID b225c5e76ed1053e505e392423b0dab065a3b813 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Mon Apr 28 02:24:27 UTC 2025
On branch cf/4677
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v13-0001-Remove-FormData_pg_sequence_data-from-init_param.patch ===
Applying: Remove FormData_pg_sequence_data from init_params()/sequence.c
Using index info to reconstruct a base tree...
M	src/backend/commands/sequence.c
Falling back to patching base and 3-way merge...
Auto-merging src/backend/commands/sequence.c
CONFLICT (content): Merge conflict in src/backend/commands/sequence.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 Remove FormData_pg_sequence_data from init_params()/sequence.c
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/commands/sequence.c
=== using patch(1) to apply patch ./v13-0001-Remove-FormData_pg_sequence_data-from-init_param.patch ===
patching file src/backend/commands/sequence.c
Hunk #17 FAILED at 1555.
Hunk #18 FAILED at 1590.
2 out of 18 hunks FAILED -- saving rejects to file src/backend/commands/sequence.c.rej
Unstaged changes after reset:
M	src/backend/commands/sequence.c
Removing src/backend/commands/sequence.c.rej
=== using 'git apply' to apply patch ./v13-0001-Remove-FormData_pg_sequence_data-from-init_param.patch ===
Applied patch to 'src/backend/commands/sequence.c' with conflicts.
U src/backend/commands/sequence.c
diff --cc src/backend/commands/sequence.c
index 451ae6f7f69,576c2ec502d..00000000000
--- a/src/backend/commands/sequence.c
+++ b/src/backend/commands/sequence.c
@@@ -1551,18 -1568,18 +1568,30 @@@ init_params(ParseState *pstate, List *o
  	}
  
  	/* crosscheck RESTART (or current value, if changing MIN/MAX) */
- 	if (seqdataform->last_value < seqform->seqmin)
+ 	if (*last_value < seqform->seqmin)
  		ereport(ERROR,
  				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
++<<<<<<< ours
 +				 errmsg("RESTART value (%" PRId64 ") cannot be less than MINVALUE (%" PRId64 ")",
 +						seqdataform->last_value,
 +						seqform->seqmin)));
 +	if (seqdataform->last_value > seqform->seqmax)
 +		ereport(ERROR,
 +				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 +				 errmsg("RESTART value (%" PRId64 ") cannot be greater than MAXVALUE (%" PRId64 ")",
 +						seqdataform->last_value,
 +						seqform->seqmax)));
++=======
+ 				 errmsg("RESTART value (%lld) cannot be less than MINVALUE (%lld)",
+ 						(long long) *last_value,
+ 						(long long) seqform->seqmin)));
+ 	if (*last_value > seqform->seqmax)
+ 		ereport(ERROR,
+ 				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+ 				 errmsg("RESTART value (%lld) cannot be greater than MAXVALUE (%lld)",
+ 						(long long) *last_value,
+ 						(long long) seqform->seqmax)));
++>>>>>>> theirs
  
  	/* CACHE */
  	if (cache_value != NULL)
@@@ -1571,9 -1588,9 +1600,15 @@@
  		if (seqform->seqcache <= 0)
  			ereport(ERROR,
  					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
++<<<<<<< ours
 +					 errmsg("CACHE (%" PRId64 ") must be greater than zero",
 +							seqform->seqcache)));
 +		seqdataform->log_cnt = 0;
++=======
+ 					 errmsg("CACHE (%lld) must be greater than zero",
+ 							(long long) seqform->seqcache)));
+ 		*reset_state = true;
++>>>>>>> theirs
  	}
  	else if (isInit)
  	{