=== Applying patches on top of PostgreSQL commit ID c62b330912e2095dc8dee2f749adf7e5d94ca611 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sat Sep 19 11:00:29 UTC 2026
On branch cf/7314
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v3-0001-Clean-up-pgoutput-schema-cache-when-streamed-transactions-prepare.patch ===
Applying: Clean up pgoutput schema cache when streamed transactions prepare
Using index info to reconstruct a base tree...
M	src/backend/replication/pgoutput/pgoutput.c
Falling back to patching base and 3-way merge...
Auto-merging src/backend/replication/pgoutput/pgoutput.c
CONFLICT (content): Merge conflict in src/backend/replication/pgoutput/pgoutput.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Clean up pgoutput schema cache when streamed transactions prepare
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 ./v3-0001-Clean-up-pgoutput-schema-cache-when-streamed-transactions-prepare.patch ===
patching file src/backend/replication/pgoutput/pgoutput.c
Hunk #1 FAILED at 220.
Hunk #2 succeeded at 1760 with fuzz 2 (offset -203 lines).
Hunk #3 FAILED at 2375.
Hunk #4 FAILED at 2395.
3 out of 4 hunks FAILED -- saving rejects to file src/backend/replication/pgoutput/pgoutput.c.rej
Unstaged changes after reset:
M	src/backend/replication/pgoutput/pgoutput.c
Removing src/backend/replication/pgoutput/pgoutput.c.rej
=== using 'git apply' to apply patch ./v3-0001-Clean-up-pgoutput-schema-cache-when-streamed-transactions-prepare.patch ===
Applied patch to 'src/backend/replication/pgoutput/pgoutput.c' with conflicts.
U src/backend/replication/pgoutput/pgoutput.c
diff --cc src/backend/replication/pgoutput/pgoutput.c
index b481d5bb388,dada328cd46..00000000000
--- a/src/backend/replication/pgoutput/pgoutput.c
+++ b/src/backend/replication/pgoutput/pgoutput.c
@@@ -2395,10 -2395,10 +2395,17 @@@ cleanup_rel_sync_cache(TransactionId xi
  	while ((entry = hash_seq_search(&hash_seq)) != NULL)
  	{
  		/*
++<<<<<<< ours
 +		 * We can set the schema_sent flag for an entry that has a committed
 +		 * or prepared xid in the list as that ensures that the subscriber
 +		 * would have the corresponding schema and we don't need to send it
 +		 * unless there is any invalidation for that relation.
++=======
+ 		 * We can set the schema_sent flag for an entry that has a committed or
+ 		 * prepared xid in the list as that ensures that the subscriber would
+ 		 * have the corresponding schema and we don't need to send it unless
+ 		 * there is any invalidation for that relation.
++>>>>>>> theirs
  		 */
  		foreach_xid(streamed_txn, entry->streamed_txns)
  		{