=== Applying patches on top of PostgreSQL commit ID b70cafd85fb5040d49a4e026fa9798d4ed5de17b ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sun Nov  2 15:37:23 UTC 2025
On branch cf/6105
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v2-0001-Use-designated-initializers-for-guc_tables.patch ===
Applying: Use designated initializers for guc_tables
Using index info to reconstruct a base tree...
M	src/backend/utils/misc/gen_guc_tables.pl
Falling back to patching base and 3-way merge...
Auto-merging src/backend/utils/misc/gen_guc_tables.pl
CONFLICT (content): Merge conflict in src/backend/utils/misc/gen_guc_tables.pl
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Use designated initializers for guc_tables
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/misc/gen_guc_tables.pl
=== using patch(1) to apply patch ./v2-0001-Use-designated-initializers-for-guc_tables.patch ===
patching file src/backend/utils/misc/gen_guc_tables.pl
Hunk #1 FAILED at 57.
1 out of 1 hunk FAILED -- saving rejects to file src/backend/utils/misc/gen_guc_tables.pl.rej
Removing src/backend/utils/misc/gen_guc_tables.pl.rej
=== using 'git apply' to apply patch ./v2-0001-Use-designated-initializers-for-guc_tables.patch ===
Applied patch to 'src/backend/utils/misc/gen_guc_tables.pl' with conflicts.
U src/backend/utils/misc/gen_guc_tables.pl
diff --cc src/backend/utils/misc/gen_guc_tables.pl
index 3efde02bab8,a48a9ebd0eb..00000000000
--- a/src/backend/utils/misc/gen_guc_tables.pl
+++ b/src/backend/utils/misc/gen_guc_tables.pl
@@@ -49,34 -53,36 +49,63 @@@ sub print_tabl
  
  	foreach my $entry (@{$parse})
  	{
 -		next if $entry->{type} ne $type;
 -
  		print $ofh "#ifdef $entry->{ifdef}\n" if $entry->{ifdef};
  		print $ofh "\t{\n";
++<<<<<<< ours
 +		printf $ofh "\t\t.name = %s,\n", dquote($entry->{name});
 +		printf $ofh "\t\t.context = %s,\n", $entry->{context};
 +		printf $ofh "\t\t.group = %s,\n", $entry->{group};
 +		printf $ofh "\t\t.short_desc = gettext_noop(%s),\n",
 +		  dquote($entry->{short_desc});
 +		printf $ofh "\t\t.long_desc = gettext_noop(%s),\n",
 +		  dquote($entry->{long_desc})
 +		  if $entry->{long_desc};
 +		printf $ofh "\t\t.flags = %s,\n", $entry->{flags} if $entry->{flags};
 +		printf $ofh "\t\t.vartype = %s,\n", ('PGC_' . uc($entry->{type}));
 +		printf $ofh "\t\t._%s = {\n", $entry->{type};
 +		printf $ofh "\t\t\t.variable = &%s,\n", $entry->{variable};
 +		printf $ofh "\t\t\t.boot_val = %s,\n", $entry->{boot_val};
 +		printf $ofh "\t\t\t.min = %s,\n", $entry->{min}
 +		  if $entry->{type} eq 'int' || $entry->{type} eq 'real';
 +		printf $ofh "\t\t\t.max = %s,\n", $entry->{max}
 +		  if $entry->{type} eq 'int' || $entry->{type} eq 'real';
 +		printf $ofh "\t\t\t.options = %s,\n", $entry->{options}
 +		  if $entry->{type} eq 'enum';
 +		printf $ofh "\t\t\t.check_hook = %s,\n", $entry->{check_hook}
 +		  if $entry->{check_hook};
 +		printf $ofh "\t\t\t.assign_hook = %s,\n", $entry->{assign_hook}
 +		  if $entry->{assign_hook};
 +		printf $ofh "\t\t\t.show_hook = %s,\n", $entry->{show_hook}
 +		  if $entry->{show_hook};
 +		print $ofh "\t\t},\n";
++=======
+ 		print $ofh "\t\t{\n";
+ 		printf $ofh "\t\t\t.name = %s,\n", dquote($entry->{name});
+ 		printf $ofh "\t\t\t.context = %s,\n", $entry->{context};
+ 		printf $ofh "\t\t\t.group = %s,\n", $entry->{group};
+ 		printf $ofh "\t\t\t.short_desc = gettext_noop(%s),\n",
+ 		  dquote($entry->{short_desc});
+ 		printf $ofh "\t\t\t.long_desc = gettext_noop(%s),\n",
+ 		  dquote($entry->{long_desc})
+ 		  if $entry->{long_desc};
+ 		printf $ofh "\t\t\t.flags = %s,\n", $entry->{flags}
+ 		  if $entry->{flags};
+ 		print $ofh "\t\t},\n";
+ 		printf $ofh "\t\t.variable = &%s,\n", $entry->{variable};
+ 		printf $ofh "\t\t.boot_val = %s,\n", $entry->{boot_val};
+ 		printf $ofh "\t\t.min = %s,\n", $entry->{min}
+ 		  if $entry->{type} eq 'int' || $entry->{type} eq 'real';
+ 		printf $ofh "\t\t.max = %s,\n", $entry->{max}
+ 		  if $entry->{type} eq 'int' || $entry->{type} eq 'real';
+ 		printf $ofh "\t\t.options = %s,\n", $entry->{options}
+ 		  if $entry->{type} eq 'enum';
+ 		printf $ofh "\t\t.check_hook = %s,\n", $entry->{check_hook}
+ 		  if $entry->{check_hook};
+ 		printf $ofh "\t\t.assign_hook = %s,\n", $entry->{assign_hook}
+ 		  if $entry->{assign_hook};
+ 		printf $ofh "\t\t.show_hook = %s,\n", $entry->{show_hook}
+ 		  if $entry->{show_hook};
++>>>>>>> theirs
  		print $ofh "\t},\n";
  		print $ofh "#endif\n" if $entry->{ifdef};
  		print $ofh "\n";