=== Applying patches on top of PostgreSQL commit ID 798bdcae89debabc59fa8afc6d690fec584db32f ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sat Sep  5 19:24:25 UTC 2026
On branch cf/7231
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v2-0001-pg_upgrade-Test-check-with-a-running-source-serve.patch ===
Applying: pg_upgrade: Test --check with a running source server
Using index info to reconstruct a base tree...
M	src/bin/pg_upgrade/t/002_pg_upgrade.pl
Falling back to patching base and 3-way merge...
Auto-merging src/bin/pg_upgrade/t/002_pg_upgrade.pl
CONFLICT (content): Merge conflict in src/bin/pg_upgrade/t/002_pg_upgrade.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 pg_upgrade: Test --check with a running source server
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-pg_upgrade-Test-check-with-a-running-source-serve.patch ===
patching file src/bin/pg_upgrade/t/002_pg_upgrade.pl
Hunk #1 succeeded at 523 with fuzz 1 (offset 48 lines).
Hunk #2 FAILED at 523.
1 out of 2 hunks FAILED -- saving rejects to file src/bin/pg_upgrade/t/002_pg_upgrade.pl.rej
patching file src/bin/pg_upgrade/t/003_logical_slots.pl
Unstaged changes after reset:
M	src/bin/pg_upgrade/t/002_pg_upgrade.pl
M	src/bin/pg_upgrade/t/003_logical_slots.pl
Removing src/bin/pg_upgrade/t/002_pg_upgrade.pl.rej
=== using 'git apply' to apply patch ./v2-0001-pg_upgrade-Test-check-with-a-running-source-serve.patch ===
Applied patch to 'src/bin/pg_upgrade/t/002_pg_upgrade.pl' with conflicts.
Applied patch to 'src/bin/pg_upgrade/t/003_logical_slots.pl' cleanly.
U src/bin/pg_upgrade/t/002_pg_upgrade.pl
diff --cc src/bin/pg_upgrade/t/002_pg_upgrade.pl
index a5cfd53265d,a0bc51f3292..00000000000
--- a/src/bin/pg_upgrade/t/002_pg_upgrade.pl
+++ b/src/bin/pg_upgrade/t/002_pg_upgrade.pl
@@@ -480,48 -480,41 +480,86 @@@ if (defined($ENV{oldinstall})
  # in it, like delete_old_cluster.{sh,bat}.
  chdir ${PostgreSQL::Test::Utils::tmp_check};
  
++<<<<<<< ours
 +# Checks with the old server still running.
 +SKIP:
 +{
 +	skip "Timing issues with live server detection on Windows", 5
 +	  if ($windows_os);
 +
 +	my @live_check_command = (
 +		'pg_upgrade', '--no-sync',
 +		'--old-datadir' => $oldnode->data_dir,
 +		'--new-datadir' => $newnode->data_dir,
 +		'--old-bindir' => $oldbindir,
 +		'--new-bindir' => $newbindir,
 +		'--socketdir' => $newnode->host,
 +		'--old-port' => $oldnode->port);
 +
 +	# A live check must use different ports for the running old server and
 +	# the temporary new server.
 +	command_checks_all(
 +		[
 +			@live_check_command,
 +			'--new-port' => $oldnode->port,
 +			$mode, '--check',
 +		],
 +		1,
 +		[
 +			qr/When checking a live server, the old and new port numbers must be different\./
 +		],
 +		[],
 +		'pg_upgrade --check with the same old and new ports');
 +
 +	rmtree($newnode->data_dir . "/pg_upgrade_output.d");
 +
 +	# Check the old cluster while it is running.
 +	command_like(
 +		[
 +			@live_check_command,
 +			'--new-port' => $newnode->port,
 +			$mode, '--check',
 +		],
 +		qr/Performing Consistency Checks on Old Live Server/,
 +		'run of pg_upgrade --check with old instance running');
 +}
++=======
+ my @live_check_command = (
+ 	'pg_upgrade', '--no-sync',
+ 	'--old-datadir' => $oldnode->data_dir,
+ 	'--new-datadir' => $newnode->data_dir,
+ 	'--old-bindir' => $oldbindir,
+ 	'--new-bindir' => $newbindir,
+ 	'--socketdir' => $newnode->host,
+ 	'--old-port' => $oldnode->port);
+ 
+ # A live check must use different ports for the running old server and
+ # the temporary new server.
+ command_checks_all(
+ 	[
+ 		@live_check_command,
+ 		'--new-port' => $oldnode->port,
+ 		$mode, '--check',
+ 	],
+ 	1,
+ 	[
+ 		qr/When checking a live server, the old and new port numbers must be different\./
+ 	],
+ 	[],
+ 	'pg_upgrade --check with the same old and new ports');
+ 
+ rmtree($newnode->data_dir . "/pg_upgrade_output.d");
+ 
+ # Check the old cluster while it is running.
+ command_like(
+ 	[
+ 		@live_check_command,
+ 		'--new-port' => $newnode->port,
+ 		$mode, '--check',
+ 	],
+ 	qr/Performing Consistency Checks on Old Live Server/,
+ 	'run of pg_upgrade --check with old instance running');
++>>>>>>> theirs
  
  # Create an invalid database, will be deleted below
  $oldnode->safe_psql(