=== Applying patches on top of PostgreSQL commit ID 98c41fed6fce927539400bc02974b9cb3184befc === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Tue Oct 6 22:28:32 UTC 2026 On branch cf/6972 nothing to commit, working tree clean === using 'git am' to apply patch ./v6-0001-Re-read-subscription-state-after-lock-in-AlterSub.patch === Applying: Re-read subscription state after lock in AlterSubscription Using index info to reconstruct a base tree... M src/backend/commands/subscriptioncmds.c M src/test/isolation/isolation_schedule Falling back to patching base and 3-way merge... Auto-merging src/test/isolation/isolation_schedule CONFLICT (content): Merge conflict in src/test/isolation/isolation_schedule Auto-merging src/backend/commands/subscriptioncmds.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 Re-read subscription state after lock in AlterSubscription 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 ./v6-0001-Re-read-subscription-state-after-lock-in-AlterSub.patch === patching file src/backend/commands/subscriptioncmds.c Hunk #1 succeeded at 1746 (offset 16 lines). Hunk #2 succeeded at 1827 (offset 16 lines). Hunk #3 succeeded at 1837 (offset 16 lines). patching file src/test/isolation/expected/subscription-owner-locking.out patching file src/test/isolation/isolation_schedule Hunk #1 FAILED at 128. 1 out of 1 hunk FAILED -- saving rejects to file src/test/isolation/isolation_schedule.rej patching file src/test/isolation/specs/subscription-owner-locking.spec Unstaged changes after reset: M src/backend/commands/subscriptioncmds.c Removing src/test/isolation/expected/subscription-owner-locking.out Removing src/test/isolation/isolation_schedule.rej Removing src/test/isolation/specs/subscription-owner-locking.spec === using 'git apply' to apply patch ./v6-0001-Re-read-subscription-state-after-lock-in-AlterSub.patch === Applied patch to 'src/backend/commands/subscriptioncmds.c' cleanly. Falling back to direct application... Applied patch to 'src/test/isolation/isolation_schedule' with conflicts. Falling back to direct application... U src/test/isolation/isolation_schedule diff --cc src/test/isolation/isolation_schedule index f1676a961f9,eb1b257e56e..00000000000 --- a/src/test/isolation/isolation_schedule +++ b/src/test/isolation/isolation_schedule @@@ -127,7 -126,8 +127,11 @@@ test: serializable-parallel- test: serializable-parallel-3 test: matview-write-skew test: lock-nowait -test: for-portion-of test: ddl-dependency-locking ++<<<<<<< ours +test: tablespace-dependency-locking ++======= + test: subscription-owner-locking ++>>>>>>> theirs test: pub-concurrent-drop test: drop-owned-grant