|
|
@@ -1,9 +1,9 @@
|
|
|
# Git branches and tags — how this repository is organised
|
|
|
|
|
|
-**Snapshot:** 2026-10-24, after the README/tutorial/comparison refresh.
|
|
|
-`master` = the current docs commit (one local docs commit);
|
|
|
-`origin/master` = `d9a96a4` (separate compilation and its tag map).
|
|
|
-327 tags (325 `v3-*` checkpoints).
|
|
|
+**Snapshot:** 2026-10-24, after `M2 -I` and incremental separate builds.
|
|
|
+`master` = the current P1 docs/tag-map commit;
|
|
|
+`origin/master` = `b1d14f9` (the PDF comparison commit).
|
|
|
+328 tags (326 `v3-*` checkpoints).
|
|
|
|
|
|
Mental model:
|
|
|
|
|
|
@@ -14,7 +14,7 @@ Mental model:
|
|
|
|
|
|
| Branch | State | What it is |
|
|
|
| --- | --- | --- |
|
|
|
-| **`master`** | current docs commit, 1 commit ahead of origin | The only active branch; all current work is here. |
|
|
|
+| **`master`** | current P1 commit, 2 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. |
|
|
|
@@ -62,6 +62,7 @@ Each points at the commit that landed a feature, all with green gates:
|
|
|
| `v3-library-folders-summary` | `3f5ac86` | library-folder summary/docs |
|
|
|
| `v3-separate-compilation` | `0adc637` | `-c` objects, stable symbols, init links, M2make `--separate` |
|
|
|
| `v3-separate-compilation-summary` | `bfe471c` | separate-compilation summary/docs |
|
|
|
+| `v3-separate-compilation-p1` | `92d11d9` | `M2 -I` transitive resolution, incremental separate objects |
|
|
|
|
|
|
These are immutable checkpoints. Useful commands:
|
|
|
|
|
|
@@ -118,18 +119,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` = 327 (325 `v3-*`) is expected; only the
|
|
|
+`git tag --list | wc -l` = 328 (326 `v3-*`) is expected; only the
|
|
|
recent ones above matter for the current session.
|
|
|
|
|
|
## Current state
|
|
|
|
|
|
-- `origin/master` = `d9a96a4` (M5/M6 through the separate-compilation
|
|
|
- tag map). Local `master` is **1 commit ahead**: the
|
|
|
- README/tutorial/comparison docs refresh.
|
|
|
-- The feature/session tags through `v3-session-2026-10-24-separate-end`
|
|
|
- are available locally; push the docs commit (and any missing tags)
|
|
|
- when ready.
|
|
|
+- `origin/master` = `b1d14f9` (the PDF comparison commit).
|
|
|
+ Local `master` is **2 commits ahead**: `v3-separate-compilation-p1`
|
|
|
+ (`92d11d9`) and its tag-map docs commit.
|
|
|
+- `v3-separate-compilation-p1` is local; push it with `master` when
|
|
|
+ ready.
|
|
|
- Next session: start from `master` and read
|
|
|
`docs/handoff-2026-10-23-next.md`; fill separate-compilation gaps
|
|
|
- (`M2 -I` import scanning, incremental objects, generic instances,
|
|
|
- per-object self-host).
|
|
|
+ (generic-instance objects and a green per-object self-host fixpoint;
|
|
|
+ `M2 -I` and incremental objects are now done).
|
