OXYGENHUB

Backlog: M8 done c2d790f9fa95

Author
Andy McCall @andymccall <[email protected]>
When
· 2026-09-29 01:44 UTC
Signature
✔ signed by Andy McCall
Hash
c2d790f9fa9545028cb6ea29223212bdf4fab3e4719e6f942f60c21896917ac3
Depends on
0bb901cbd059 75036530b621 c1fe1fb25021
Depended on by
d5a597d0f160 6a81dbab471d
In bookmarks
agents-in-readme bare-hashes carried-not-removed carry-identical doctor-trust identical-sides keyless-tags main merge-remote-bookmark only-help-103 paths-for-resolutions-and-amend push-notes show-stat subrepo-pin-state switch-says
In tags
v0.1.0 v0.10.0 v0.11.0 v0.2.0 v0.3.0 v0.3.1 v0.4.0 v0.4.1 v0.4.2 v0.4.3 v0.4.4 v0.4.5 v0.4.6 v0.5.0 v0.5.1 v0.6.0 v0.7.0 v0.8.0 v0.9.0
Edits
3 atoms, 0 tree operations, 1 file

Browse the tree at this change

hide whitespace changes
modified docs/backlog-overnight-2.md +6 −1
… 
74 unchanged lines
75 75 
- [x] M5 Sandbox-level `env` in pipeline.kdl, and the image's environment kept through `flow rootfs import` (feedback 16).
76 76 
- [x] M6 Flow API: `GET /repos/{o}/{n}/flow/runs`, `/flow/runs/{n}` with jobs, a job's log; checks by head hash as well as state (feedback 11). JSON 404s under `/api/v1` (feedback 13). Per-repository run numbers, or a note (feedback 12).
77 77 
- [x] M7 Server push errors name the operation and bookmark and log the error chain (feedback 2).
78 - 
- [ ] M8 `merge` updates a working copy that is clean against the pre-merge base; `checkout` tells "removed by you" from "not yet written"; `bookmark switch --help` says what happens to uncommitted work (feedback 3).
78 + 
- [x] M8 `merge` updates a working copy that is clean against the pre-merge base; `checkout` tells "removed by you" from "not yet written"; `bookmark switch --help` says what happens to uncommitted work (feedback 3).
79 79 
- [ ] M9 Small oxy items: `oxy describe` (tag, else bookmark + change, `+dirty`) and tags accepted where a change is (feedback 4); `commit -F` (6); `submodule status` shows added-but-unpinned and has `--json` (5, 7); doctor before the first commit (8).
80 80 
- [ ] M10 Hub: say "signed by an unlinked key" on changes and in `/api/v1/user`, pointing at Settings (feedback 14).
81 81 
- [ ] P1 **Conflict resolution on OxygenHub** (Andy's list, item 1). A resolver page for a conflicted state:
… 
449 unchanged lines
531 531 
  - The server's own storage failing answers 500, not 400.
532 532 
  - HTTP test with an attestation store that cannot be written. Spec §16.4.
533 533 
  - Pinned through oxygenflow into the hub and deployed. All three runs green.
534 + 
- 2026-09-29 **M8 done** (oxygen#17; feedback 3).
535 + 
  - **Not reproduced exactly:** a switch then merge, and an emptied directory, both behaved. So I fixed the two gaps the report points at.
536 + 
  - **Merge:** a working copy without changes now follows it, whichever state it sat on. It previously also had to sit exactly on the bookmark's old heads, the likely cause of the lagging working copy.
537 + 
  - **Checkout refusals** name each changed path and how ("removed b.txt" means in the base but not on disk), and offer `--carry`. It shares `Repo::checkout_carry` with `bookmark switch --carry`.
538 + 
  - One test; spec §10.1. Run green.