=== Applying patches on top of PostgreSQL commit ID 5092aae431e3e1a20324ea3a42a181c63f703d0d ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sat Oct  4 06:33:26 UTC 2025
On branch cf/5378
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v2-0001-Stablize-the-tests-in-035_conflicts.patch ===
Applying: Stablize the tests in 035_conflicts
Using index info to reconstruct a base tree...
M	src/test/subscription/t/035_conflicts.pl
Falling back to patching base and 3-way merge...
Auto-merging src/test/subscription/t/035_conflicts.pl
CONFLICT (content): Merge conflict in src/test/subscription/t/035_conflicts.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 Stablize the tests in 035_conflicts
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/test/subscription/t/035_conflicts.pl
=== using patch(1) to apply patch ./v2-0001-Stablize-the-tests-in-035_conflicts.patch ===
patching file src/test/subscription/t/035_conflicts.pl
Hunk #1 FAILED at 342.
Hunk #2 FAILED at 555.
Hunk #3 FAILED at 625.
Hunk #4 succeeded at 630 with fuzz 2 (offset -12 lines).
3 out of 4 hunks FAILED -- saving rejects to file src/test/subscription/t/035_conflicts.pl.rej
Unstaged changes after reset:
M	src/test/subscription/t/035_conflicts.pl
Removing src/test/subscription/t/035_conflicts.pl.rej
=== using 'git apply' to apply patch ./v2-0001-Stablize-the-tests-in-035_conflicts.patch ===
Applied patch to 'src/test/subscription/t/035_conflicts.pl' with conflicts.
U src/test/subscription/t/035_conflicts.pl
diff --cc src/test/subscription/t/035_conflicts.pl
index 741f5397478,21e992cea50..00000000000
--- a/src/test/subscription/t/035_conflicts.pl
+++ b/src/test/subscription/t/035_conflicts.pl
@@@ -621,10 -621,9 +621,16 @@@ $node_A->safe_psql('postgres'
  	"ALTER SUBSCRIPTION $subname_AB SET (max_retention_duration = 0);");
  
  # Drop the physical slot and reset the synchronized_standby_slots setting. We
++<<<<<<< ours
 +# change this after setting max_retention_duration to 0, ensuring consistent
 +# results in the test as the resumption becomes possible immediately after
 +# resetting synchronized_standby_slots, due to the smaller max_retention_duration
 +# value of 1ms.
++=======
+ # change this after setting max_retention_duration to 0, ensuring the apply
+ # worker does not resume prematurely without noticing the updated
+ # max_retention_duration value.
++>>>>>>> theirs
  $node_B->safe_psql('postgres',
  	"SELECT * FROM pg_drop_replication_slot('blocker');");
  $node_B->adjust_conf('postgresql.conf', 'synchronized_standby_slots', "''");