=== Applying patches on top of PostgreSQL commit ID ec13f71049cda06ea55a67783b822d98824f4d15 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sat Aug 29 20:10:24 UTC 2026
On branch cf/7089
nothing to commit, working tree clean
=== using 'git am' to apply patch ./fix-exported-snapshot-xmin-handoff-race-v5.patch ===
Applying: Fix exported snapshot xmin handoff race
Using index info to reconstruct a base tree...
M	src/backend/commands/vacuum.c
M	src/backend/storage/ipc/procarray.c
Falling back to patching base and 3-way merge...
Auto-merging src/backend/storage/ipc/procarray.c
CONFLICT (content): Merge conflict in src/backend/storage/ipc/procarray.c
Auto-merging src/backend/commands/vacuum.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 exported snapshot xmin handoff race
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 ./fix-exported-snapshot-xmin-handoff-race-v5.patch ===
patching file src/backend/commands/vacuum.c
Hunk #1 succeeded at 1159 (offset 20 lines).
patching file src/backend/storage/ipc/procarray.c
Hunk #2 FAILED at 2498.
1 out of 2 hunks FAILED -- saving rejects to file src/backend/storage/ipc/procarray.c.rej
patching file src/test/modules/test_misc/meson.build
patching file src/test/modules/test_misc/t/015_export_snapshot.pl
Unstaged changes after reset:
M	src/backend/commands/vacuum.c
M	src/backend/storage/ipc/procarray.c
M	src/test/modules/test_misc/meson.build
Removing src/backend/storage/ipc/procarray.c.rej
Removing src/test/modules/test_misc/t/015_export_snapshot.pl
=== using 'git apply' to apply patch ./fix-exported-snapshot-xmin-handoff-race-v5.patch ===
Applied patch to 'src/backend/commands/vacuum.c' cleanly.
Applied patch to 'src/backend/storage/ipc/procarray.c' with conflicts.
Applied patch to 'src/test/modules/test_misc/meson.build' cleanly.
Falling back to direct application...
U src/backend/storage/ipc/procarray.c
diff --cc src/backend/storage/ipc/procarray.c
index b7e03134ed8,9ce5dcfcb68..00000000000
--- a/src/backend/storage/ipc/procarray.c
+++ b/src/backend/storage/ipc/procarray.c
@@@ -2487,12 -2497,7 +2497,16 @@@ ProcArrayInstallImportedXmin(Transactio
  	if (!sourcevxid)
  		return false;
  
++<<<<<<< ours
 +	/*
 +	 * Take the lock in exclusive mode to ensure that installing xmin is
 +	 * atomic with our check that the source transaction is still running.
 +	 * (Using shared mode risks a concurrent VACUUM whose ComputeXidHorizons()
 +	 * call fails to observe the xmin in either the source proc or our own.)
 +	 */
++=======
+ 	/* Get lock so source xact can't end while we're doing this */
++>>>>>>> theirs
  	LWLockAcquire(ProcArrayLock, LW_EXCLUSIVE);
  
  	/*