mirror of
https://github.com/stablyai/orca.git
synced 2026-09-26 16:02:43 +00:00
Brennan Benson
e4939e5191
The base moved 31 commits: #19849 merged main forward, #19848 landed on main as a squash, and several mobile domains migrated onto typed RpcOperations. The only conflicts were 12 settings goldens, and only in two header digests. Both sides had moved a digest for a legitimate and different reason: upstream added ~35 files under src/test-support/rpc-recording/, which recorderSha256 covers, while this branch edited workspace-settings-mounts.ts, which adapterSha256 covers - and upstream never touched that adapter. So neither side's pair described the merged tree, and taking either wholesale would have committed a header that lies about the sources it was recorded from. Resolved by re-recording from the merged tree, which computes both digests from the actual merged files. The result pairs upstream's recorderSha256 with this branch's adapterSha256. All 12 bodies are byte-identical to what was already on disk, so nothing behavioural changed: the conflict was entirely provenance. The golden set grew 208 -> 509 with upstream's new scenarios; recorded set and on-disk set match exactly, with no stale and no missing files.