=== Applying patches on top of PostgreSQL commit ID 1aa7cf9eb85972aaf2969306e84f5fc794fbef7f ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sun Apr 27 23:48:22 UTC 2025
On branch cf/5638
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v-1-0001-Minor-rework-of-ALTER-TABLE-SET-RelOptions-code.patch ===
Applying: 1/1] Minor rework of ALTER TABLE SET RelOptions code
Using index info to reconstruct a base tree...
M	src/backend/commands/tablecmds.c
Falling back to patching base and 3-way merge...
Auto-merging src/backend/commands/tablecmds.c
CONFLICT (content): Merge conflict in src/backend/commands/tablecmds.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 1/1] Minor rework of ALTER TABLE SET RelOptions code
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/tablecmds.c
=== using patch(1) to apply patch ./v-1-0001-Minor-rework-of-ALTER-TABLE-SET-RelOptions-code.patch ===
patching file src/backend/commands/tablecmds.c
Hunk #1 FAILED at 15804.
Hunk #2 FAILED at 15829.
Hunk #3 succeeded at 13918 with fuzz 2 (offset -1943 lines).
Hunk #4 FAILED at 15956.
3 out of 4 hunks FAILED -- saving rejects to file src/backend/commands/tablecmds.c.rej
Unstaged changes after reset:
M	src/backend/commands/tablecmds.c
Removing src/backend/commands/tablecmds.c.rej
=== using 'git apply' to apply patch ./v-1-0001-Minor-rework-of-ALTER-TABLE-SET-RelOptions-code.patch ===
Applied patch to 'src/backend/commands/tablecmds.c' with conflicts.
U src/backend/commands/tablecmds.c
diff --cc src/backend/commands/tablecmds.c
index 2705cf11330,a0f78f036b6..00000000000
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@@ -16603,7 -15832,6 +16603,10 @@@ ATExecSetRelOptions(Relation rel, List 
  	else
  	{
  		bool		isnull;
++<<<<<<< ours
 +
++=======
++>>>>>>> theirs
  		/* Get the old reloptions */
  		datum = SysCacheGetAttr(RELOID, tuple, Anum_pg_class_reloptions,
  								&isnull);
@@@ -16633,7 -15861,11 +16636,15 @@@
  			(void) index_reloptions(rel->rd_indam->amoptions, newOptions, true);
  			break;
  		case RELKIND_TOASTVALUE:
++<<<<<<< ours
 +			/* fall through to error -- shouldn't ever get here */
++=======
+ 			/* Should never get here */
+ 			/* TOAST options are never altered directly */
+ 			Assert(0);
+ 			/* FALLTHRU */
+ 			/* If we get here in prod. error is the best option */
++>>>>>>> theirs
  		default:
  			ereport(ERROR,
  					(errcode(ERRCODE_WRONG_OBJECT_TYPE),
@@@ -16727,7 -15959,6 +16738,10 @@@
  		else
  		{
  			bool		isnull;
++<<<<<<< ours
 +
++=======
++>>>>>>> theirs
  			/* Get the old reloptions */
  			datum = SysCacheGetAttr(RELOID, tuple, Anum_pg_class_reloptions,
  									&isnull);
@@@ -16736,7 -15967,7 +16750,11 @@@
  		}
  
  		newOptions = transformRelOptions(datum, defList, "toast", validnsps,
++<<<<<<< ours
 +										 false, operation == AT_ResetRelOptions);
++=======
+ 										false, operation == AT_ResetRelOptions);
++>>>>>>> theirs
  
  		(void) heap_reloptions(RELKIND_TOASTVALUE, newOptions, true);