Ragnor Comerford 976aa0ec1d tests: pin concurrent /change + branch_merge interleave preserves writes ... Future-proofs against MR-895 work that may move or remove the per-(table, branch) writer queue acquisition inside `branch_merge` (`crates/omnigraph/src/exec/merge.rs:1224`). Today the queue linearizes a concurrent /change on main against a `branch_merge feature → main` on the same touched tables; both succeed and the inserted row is preserved post-merge. Codex flagged this scenario as a P1 in PR #75 review claiming the merge could silently overwrite concurrent target writes because the source-rewrite path opens with `MutationOpKind::Merge` (skipping the strict pre-stage check). Validation showed the queue at merge.rs:1224 is held across both Phase B (per-table commit_staged) and Phase C (manifest publish), so there's no interleave window. The Merge op_kind only affects same-process pre-stage drift detection, not cross-write linearization. The test passes on f925ad1; landing it as a regression sentinel catches future changes that drop the queue acquisition. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>		2026-05-08 17:03:05 +02:00
..
examples	mr-686: bundle PR 0/1a/1b foundation + PR 2 catalog/schema_source ArcSwap	2026-05-07 16:22:38 +02:00
src	server: emit Retry-After header on 429 / 503 responses	2026-05-08 16:58:47 +02:00
tests	tests: pin concurrent /change + branch_merge interleave preserves writes	2026-05-08 17:03:05 +02:00
Cargo.toml	server: add WorkloadController for per-actor admission (PR 2 Step E)	2026-05-07 16:59:45 +02:00