=== Applying patches on top of PostgreSQL commit ID 3c982c9bf1af994090a181c68f9407ff39d3ddf7 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Tue Aug 25 21:30:28 UTC 2026
On branch cf/7158
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v16-0001-Close-relations-opened-specifically-for-AFTER-tr.patch ===
Applying: Close relations opened specifically for AFTER triggers
Using index info to reconstruct a base tree...
M	src/backend/executor/execMain.c
M	src/backend/replication/logical/worker.c
M	src/include/executor/executor.h
M	src/test/subscription/t/013_partition.pl
Falling back to patching base and 3-way merge...
Auto-merging src/test/subscription/t/013_partition.pl
Auto-merging src/include/executor/executor.h
Auto-merging src/backend/replication/logical/worker.c
Auto-merging src/backend/executor/execMain.c
=== using 'git am' to apply patch ./v20-0001-Close-relations-opened-specifically-for-AFTER-tr.patch ===
Applying: Close relations opened specifically for AFTER triggers
Using index info to reconstruct a base tree...
M	src/backend/executor/execMain.c
M	src/backend/replication/logical/worker.c
M	src/include/executor/executor.h
M	src/test/subscription/t/013_partition.pl
Falling back to patching base and 3-way merge...
Auto-merging src/test/subscription/t/013_partition.pl
CONFLICT (content): Merge conflict in src/test/subscription/t/013_partition.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 Close relations opened specifically for AFTER triggers
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 ./v20-0001-Close-relations-opened-specifically-for-AFTER-tr.patch ===
patching file src/backend/executor/execMain.c
Hunk #1 succeeded at 1686 with fuzz 2 (offset 16 lines).
patching file src/backend/replication/logical/worker.c
Hunk #1 FAILED at 945.
1 out of 1 hunk FAILED -- saving rejects to file src/backend/replication/logical/worker.c.rej
patching file src/include/executor/executor.h
Hunk #1 FAILED at 703.
1 out of 1 hunk FAILED -- saving rejects to file src/include/executor/executor.h.rej
patching file src/test/subscription/t/013_partition.pl
Hunk #1 succeeded at 904 with fuzz 2 (offset 7 lines).
Unstaged changes after reset:
M	src/backend/executor/execMain.c
M	src/test/subscription/t/013_partition.pl
Removing src/backend/replication/logical/worker.c.rej
Removing src/include/executor/executor.h.rej
=== using 'git apply' to apply patch ./v20-0001-Close-relations-opened-specifically-for-AFTER-tr.patch ===
Applied patch to 'src/backend/executor/execMain.c' cleanly.
Applied patch to 'src/backend/replication/logical/worker.c' cleanly.
Applied patch to 'src/include/executor/executor.h' cleanly.
Applied patch to 'src/test/subscription/t/013_partition.pl' with conflicts.
U src/test/subscription/t/013_partition.pl
diff --cc src/test/subscription/t/013_partition.pl
index fe7adb74ae1,a6ada211fab..00000000000
--- a/src/test/subscription/t/013_partition.pl
+++ b/src/test/subscription/t/013_partition.pl
@@@ -900,8 -900,8 +900,13 @@@ is($result, qq(4||1), 'updates of tab5 
  # Validate we didn't neglect to cleanup any resources on either subscriber.
  foreach my $node ($node_subscriber1, $node_subscriber2)
  {
++<<<<<<< ours
 +	ok(!$node->log_contains(qr/relcache reference leak/),
 +		'no unclosed resources on ' . $node->name);
++=======
+ 	ok(!$node->log_contains(qr/resource was not closed/),
+ 		'unclosed resources on ' . $node->name);
++>>>>>>> theirs
  }
  
  done_testing();