neuwirth
/
pmacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

docs(active-work): re-measure the base after #193, and say why once was not enough 

The previous commit pasted `git rev-parse`/`git log`/`merge-base` output
showing `main` at `64883eb` and "main IS integrated". #193 merged between
writing that and pushing it, so the pasted output was false in the tree
that carried it --- and "main is integrated" is exactly the kind of claim
this review round was about: the tree asserting something the record does
not support.

Re-measured and re-integrated, and the bullet now says the thing the
first attempt got wrong. Pasting command output is necessary and NOT
sufficient: a base measured before the last push is a claim about a tree
nobody has, so it has to be re-measured at push time and treated as
expired on sight. `main` moved three times inside this one lane
(#187 -> #192 -> #193).

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Lv428Fth9LRtffwJSsqH7T
This commit is contained in:
Levi Neuwirth 2026-07-29 11:47:55 -04:00
parent fe6d38ebfb
commit dab0c184e1
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
docs/active-work.md
View File

@ -262,16 +262,21 @@ until it merges.
```
$ git rev-parse --short githubsucks/main
64883eb
5e186c7
$ git log --oneline -1 githubsucks/main
64883eb Merge pull request #192 from levineuwirth/bite-positive-control
5e186c7 Merge pull request #193 from levineuwirth/test-improvement-audit
$ git merge-base --is-ancestor githubsucks/main HEAD && echo "main IS integrated"
main IS integrated
```
**That is a reading, not a constant.** `main` moved twice while this
lane was open (#187 -> #192, with #193 behind it). Re-measure before
quoting it; do not copy the SHA forward.
**That is a reading, not a constant, and it went stale inside this
lane's own review round.** `main` moved three times while the lane was
open: #187 -> #192 -> #193. An earlier revision of this bullet pasted
the same three commands with `64883eb` and the same `main IS
integrated` line, and #193 merged between writing it and pushing it ---
so the pasted output was false in the tree that carried it. Pasting
command output is necessary and **not sufficient**: re-measure at push
time, and treat any base SHA in this file as expired on sight.
- **What Stage 1 ships.** `dired.lua`'s `paint` and `listview.lua`'s
`render` write through `pmacs.buffer.set_generated_contents` (zero
`bypass_intercept` writes remain in either file); `listview` gains