=== Applying patches on top of PostgreSQL commit ID 6f3bdadaadc4692050ca20dff53d3890088b9272 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Fri Oct  2 20:01:31 UTC 2026
On branch cf/7366
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v2-0001-Fix-clobbering-of-shared-statusFlags-when-a-slot-.patch ===
Applying: Fix clobbering of shared statusFlags when a slot is invalidated
Using index info to reconstruct a base tree...
M	src/backend/replication/slot.c
Falling back to patching base and 3-way merge...
Auto-merging src/backend/replication/slot.c
CONFLICT (content): Merge conflict in src/backend/replication/slot.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 Fix clobbering of shared statusFlags when a slot is invalidated
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-Fix-clobbering-of-shared-statusFlags-when-a-slot-.patch ===
patching file src/backend/replication/slot.c
Hunk #1 FAILED at 831.
1 out of 1 hunk FAILED -- saving rejects to file src/backend/replication/slot.c.rej
patching file src/test/recovery/meson.build
patching file src/test/recovery/t/058_slot_invalidation_statusflags.pl
Unstaged changes after reset:
M	src/test/recovery/meson.build
Removing src/backend/replication/slot.c.rej
Removing src/test/recovery/t/058_slot_invalidation_statusflags.pl
=== using 'git apply' to apply patch ./v2-0001-Fix-clobbering-of-shared-statusFlags-when-a-slot-.patch ===
Applied patch to 'src/backend/replication/slot.c' with conflicts.
Applied patch to 'src/test/recovery/meson.build' cleanly.
Falling back to direct application...
U src/backend/replication/slot.c
diff --cc src/backend/replication/slot.c
index 839730e929d,c84d021aeaf..00000000000
--- a/src/backend/replication/slot.c
+++ b/src/backend/replication/slot.c
@@@ -832,10 -832,10 +832,17 @@@ ReplicationSlotRelease(void
  	}
  
  	/*
++<<<<<<< ours
 +	 * Update statusFlags only if PROC_IN_LOGICAL_DECODING is set.  An
 +	 * auxiliary process (checkpointer or startup process) may invalidate a
 +	 * slot.  Auxiliary processes are not in the proc array, and pgxactoff
 +	 * would point at something which is not its own.
++=======
+ 	 * Only touch ProcGlobal->statusFlags[] if we set
+ 	 * PROC_IN_LOGICAL_DECODING.  An auxiliary process that invalidates a slot
+ 	 * gets here too.  It is not in the proc array, so the entry at its
+ 	 * pgxactoff is not its own.
++>>>>>>> theirs
  	 */
  	if (MyProc->statusFlags & PROC_IN_LOGICAL_DECODING)
  	{