=== Applying patches on top of PostgreSQL commit ID 2bc60f86219b00a9ba23efab8f4bb8de21e64e2a ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Wed Jan 14 14:56:20 UTC 2026
On branch cf/6028
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v25-0001-Support-existing-publications-in-pg_createsubscr.patch ===
Applying: Support existing publications in pg_createsubscriber
Using index info to reconstruct a base tree...
M	doc/src/sgml/ref/pg_createsubscriber.sgml
M	src/bin/pg_basebackup/pg_createsubscriber.c
M	src/bin/pg_basebackup/t/040_pg_createsubscriber.pl
Falling back to patching base and 3-way merge...
Auto-merging src/bin/pg_basebackup/t/040_pg_createsubscriber.pl
CONFLICT (content): Merge conflict in src/bin/pg_basebackup/t/040_pg_createsubscriber.pl
Auto-merging src/bin/pg_basebackup/pg_createsubscriber.c
Auto-merging doc/src/sgml/ref/pg_createsubscriber.sgml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Support existing publications in pg_createsubscriber
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/bin/pg_basebackup/t/040_pg_createsubscriber.pl
=== using patch(1) to apply patch ./v25-0001-Support-existing-publications-in-pg_createsubscr.patch ===
patching file doc/src/sgml/ref/pg_createsubscriber.sgml
Hunk #1 succeeded at 326 with fuzz 1 (offset 41 lines).
patching file src/bin/pg_basebackup/pg_createsubscriber.c
Hunk #1 FAILED at 116.
Hunk #2 succeeded at 835 (offset 71 lines).
Hunk #3 FAILED at 832.
Hunk #4 FAILED at 1782.
Hunk #5 FAILED at 1818.
4 out of 5 hunks FAILED -- saving rejects to file src/bin/pg_basebackup/pg_createsubscriber.c.rej
patching file src/bin/pg_basebackup/t/040_pg_createsubscriber.pl
Hunk #1 FAILED at 443.
Hunk #2 succeeded at 356 with fuzz 2 (offset -100 lines).
Hunk #3 FAILED at 478.
Hunk #4 FAILED at 525.
Hunk #5 succeeded at 624 with fuzz 2 (offset 87 lines).
3 out of 5 hunks FAILED -- saving rejects to file src/bin/pg_basebackup/t/040_pg_createsubscriber.pl.rej
Unstaged changes after reset:
M	doc/src/sgml/ref/pg_createsubscriber.sgml
M	src/bin/pg_basebackup/pg_createsubscriber.c
M	src/bin/pg_basebackup/t/040_pg_createsubscriber.pl
Removing src/bin/pg_basebackup/pg_createsubscriber.c.rej
Removing src/bin/pg_basebackup/t/040_pg_createsubscriber.pl.rej
=== using 'git apply' to apply patch ./v25-0001-Support-existing-publications-in-pg_createsubscr.patch ===
Applied patch to 'doc/src/sgml/ref/pg_createsubscriber.sgml' cleanly.
Applied patch to 'src/bin/pg_basebackup/pg_createsubscriber.c' cleanly.
Applied patch to 'src/bin/pg_basebackup/t/040_pg_createsubscriber.pl' with conflicts.
U src/bin/pg_basebackup/t/040_pg_createsubscriber.pl
diff --cc src/bin/pg_basebackup/t/040_pg_createsubscriber.pl
index e1de946488e,9e0db6cd099..00000000000
--- a/src/bin/pg_basebackup/t/040_pg_createsubscriber.pl
+++ b/src/bin/pg_basebackup/t/040_pg_createsubscriber.pl
@@@ -585,45 -581,6 +585,48 @@@ is($result, qq($db1|{test_pub3
  $db2|{pub2}),
  	"subscriptions use the correct publications");
  
++<<<<<<< ours
 +# Verify that node K, set as a standby, is able to start correctly without
 +# the recovery configuration written by pg_createsubscriber interfering.
 +# This node is created from node S, where pg_createsubscriber has been run.
 +
 +# Create a physical standby from the promoted subscriber
 +$node_s->safe_psql('postgres',
 +	"SELECT pg_create_physical_replication_slot('$slotname');");
 +
 +# Create backup from promoted subscriber
 +$node_s->backup('backup_3');
 +
 +# Initialize new physical standby
 +my $node_k = PostgreSQL::Test::Cluster->new('node_k');
 +$node_k->init_from_backup($node_s, 'backup_3', has_streaming => 1);
 +
 +my $node_k_datadir = $node_k->data_dir;
 +ok( -f "$node_k_datadir/pg_createsubscriber.conf.disabled",
 +	"pg_createsubscriber.conf.disabled exists in node K");
 +
 +# Configure the new standby
 +$node_k->append_conf(
 +	'postgresql.conf', qq[
 +primary_slot_name = '$slotname'
 +primary_conninfo = '$sconnstr dbname=postgres'
 +hot_standby_feedback = on
 +]);
 +
 +$node_k->set_standby_mode();
 +my $node_k_name = $node_s->name;
 +command_ok(
 +	[
 +		'pg_ctl', '--wait',
 +		'--pgdata' => $node_k->data_dir,
 +		'--log' => $node_k->logfile,
 +		'--options' => "--cluster-name=$node_k_name",
 +		'start'
 +	],
 +	"node K has started");
 +
++=======
++>>>>>>> theirs
  # clean up
  $node_p->teardown_node;
  $node_s->teardown_node;