Runs commit their .osf/ state, so two runs on one project always conflict at the merge #224
Loading…
Reference in a new issue
No description provided.
Delete branch "%!s()"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
Symptom
Runs 87 and 88 on cmoriarty/aurora-links3 both failed at
git.pr.mergeonce the other had merged: their pull requests conflicted withmainin 28 files each, and every one was under.osf/(briefs, review digests, test records,validate.json,workspace.json). Neither touched the other's source. Two runs on one project cannot both land without a person merging by hand, and braid#221's newagent.sync-resolvewould be spending an agent session on run state at every merge.Cause
The flow's commit steps stage the whole worktree (
git add -A), so each run commits its own.osf/state into its branch and the merge carries it onto the base branch. Every run writes the same file names, so any two pull requests conflict.clear_inherited_run_statealready removes what an earlier run left on the base at clone (Forgejo #98), which treats the symptom after the fact and leaves main carrying a different run's state at every moment.Wanted
A run's
.osf/state never reaches the pull request or the base branch. What a repository keeps under.osf/on purpose (pipeline.yaml,pipelines/) still does..osf/run state out of what it commits, and takes a tracked copy of it out of the index, so a base branch that already carries some loses it with the first run to land.git-advancedstill produce their commit..osf/.Runs 87 and 88 were rescued by hand (the conflicts merged keeping each run's own files).
Shipped in
dca5430(archived after it) and live on production..osf/state is no longer committed. The commit steps, the CI lane's check commit and the release commit take it out of the index and leave it on disk, so checkpoints and rollbacks see it as before. A repository's own.osf/pipeline.yamland.osf/pipelines/are still committed.git-advancedsteps still complete.Tests: unit tests over real repositories (two runs on one project merge without conflicts; a rollback still restores the state), and three simulated runs: a base that tracks another run's state, a base that gains it mid-run, and the existing ones. The backend and simulated-run lanes pass; the browser lane passes apart from one spec that is already braid#193's known flake. Not run: the
@livebrowser specs.Left as is: runs that were in flight when this deployed have already committed their state, and can conflict once, as before.