|
|
@@ -1,9 +1,9 @@
|
|
|
# Git branches and tags — how this repository is organised
|
|
|
|
|
|
-**Snapshot:** 2026-10-24, after ABI stamps and definition-only objects.
|
|
|
-`master` = the current ABI/docs/tag-map commit;
|
|
|
+**Snapshot:** 2026-10-24, after separate generic-instance objects.
|
|
|
+`master` = the current generic/docs/tag-map commit;
|
|
|
`origin/master` = `b1d14f9` (the PDF comparison commit).
|
|
|
-330 tags (328 `v3-*` checkpoints).
|
|
|
+331 tags (329 `v3-*` checkpoints).
|
|
|
|
|
|
Mental model:
|
|
|
|
|
|
@@ -14,7 +14,7 @@ Mental model:
|
|
|
|
|
|
| Branch | State | What it is |
|
|
|
| --- | --- | --- |
|
|
|
-| **`master`** | current ABI/class commit, 6 commits ahead of origin | The only active branch; all current work is here. |
|
|
|
+| **`master`** | current generic-instance commit, 8 commits ahead of origin | The only active branch; all current work is here. |
|
|
|
| `ast-stage-c` | `0f611c0` (2026-10-08), local only | Old stage branch, fully merged into master. Stale. |
|
|
|
| `generics-inc1` | `6639c19`, 6 commits behind `origin/generics-inc1` | Old generics work, fully merged into master. Stale. |
|
|
|
| `resolve-check` | `95ca4d6`, in sync with origin | Old branch merged into master. Stale. |
|
|
|
@@ -65,6 +65,7 @@ Each points at the commit that landed a feature, all with green gates:
|
|
|
| `v3-separate-compilation-p1` | `92d11d9` | `M2 -I` transitive resolution, incremental separate objects |
|
|
|
| `v3-separate-fixpoint` | `5374a11` | per-object stage2/stage3 self-host fixpoint |
|
|
|
| `v3-separate-abi-vtables` | `a554873` | content ABI stamp + definition-only objects/vtables |
|
|
|
+| `v3-generic-instances` | `a3664a2` | separate type/value/procedure generic-instance objects |
|
|
|
|
|
|
These are immutable checkpoints. Useful commands:
|
|
|
|
|
|
@@ -121,17 +122,17 @@ git push origin :refs/tags/v3-session-2026-10-22-final
|
|
|
The project convention is one `v3-*` tag per green step across all
|
|
|
sessions (two-phase parse slices, generics increments, Unicode, stdlib,
|
|
|
…). They are a searchable history of passing states, not branches.
|
|
|
-`git tag --list | wc -l` = 330 (328 `v3-*`) is expected; only the
|
|
|
+`git tag --list | wc -l` = 331 (329 `v3-*`) is expected; only the
|
|
|
recent ones above matter for the current session.
|
|
|
|
|
|
## Current state
|
|
|
|
|
|
- `origin/master` = `b1d14f9` (the PDF comparison commit).
|
|
|
- Local `master` is **6 commits ahead**: P1, per-object fixpoint and
|
|
|
- ABI/class feature/map commits.
|
|
|
-- `v3-separate-compilation-p1`, `v3-separate-fixpoint` and
|
|
|
- `v3-separate-abi-vtables` are local; push them with `master` when
|
|
|
- ready.
|
|
|
+ Local `master` is **8 commits ahead**: P1, per-object fixpoint,
|
|
|
+ ABI/class and generic-instance feature/map commits.
|
|
|
+- `v3-separate-compilation-p1`, `v3-separate-fixpoint`,
|
|
|
+ `v3-separate-abi-vtables` and `v3-generic-instances` are local; push
|
|
|
+ them with `master` when ready.
|
|
|
- Next session: start from `master` and read
|
|
|
`docs/handoff-2026-10-23-next.md`; fill separate-compilation gaps
|
|
|
(generic-instance objects and a green per-object self-host fixpoint;
|
