|
|
@@ -1,10 +1,10 @@
|
|
|
# Git branches and tags — how this repository is organised
|
|
|
|
|
|
-**Snapshot:** 2026-10-24, after dialect library folders.
|
|
|
-`master` = the current docs commit (library folders + tag map);
|
|
|
-`origin/master` = `6e40e26`. M5/M6, triage and library folders are
|
|
|
-local; earlier M1–M4 work is on the remote. 324 tags (322 `v3-*`
|
|
|
-checkpoints).
|
|
|
+**Snapshot:** 2026-10-24, after core separate compilation.
|
|
|
+`master` = the current docs commit (separate compilation + tag map);
|
|
|
+`origin/master` = `6e40e26`. M5/M6, triage, library folders and
|
|
|
+separate compilation are local; earlier M1–M4 work is on the remote.
|
|
|
+327 tags (325 `v3-*` checkpoints).
|
|
|
|
|
|
Mental model:
|
|
|
|
|
|
@@ -15,7 +15,7 @@ Mental model:
|
|
|
|
|
|
| Branch | State | What it is |
|
|
|
| --- | --- | --- |
|
|
|
-| **`master`** | `c0c227c` + docs, 1 commit ahead of origin | The only active branch; all current work is here. |
|
|
|
+| **`master`** | current docs commit, 15 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. |
|
|
|
@@ -61,6 +61,8 @@ Each points at the commit that landed a feature, all with green gates:
|
|
|
| `v3-corpus-triage-2026-10-24` | `895ee2e` | post-open-array corpus triage |
|
|
|
| `v3-library-folders` | `f904307` | dialect library folders |
|
|
|
| `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 |
|
|
|
|
|
|
These are immutable checkpoints. Useful commands:
|
|
|
|
|
|
@@ -81,7 +83,8 @@ git diff v3-sysclock v3-smallfix # what the last step changed
|
|
|
| `v3-session-2026-10-24-open-arrays-end` | `680ace0` | 2026-10-24 open-array M5 session tag. |
|
|
|
| `v3-session-2026-10-24-open-arrays-m6-end` | `c22e4ae` | Open-array M6 session tag. |
|
|
|
| `v3-session-2026-10-24-triage-end` | `895ee2e` | 2026-10-24 triage session tag. |
|
|
|
-| `v3-session-2026-10-24-library-folders-end` | `3f5ac86` | **Final immutable 2026-10-24 library-folders session tag.** |
|
|
|
+| `v3-session-2026-10-24-library-folders-end` | `3f5ac86` | 2026-10-24 library-folders session tag. |
|
|
|
+| `v3-session-2026-10-24-separate-end` | `bfe471c` | **Final immutable 2026-10-24 separate-compilation session tag.** |
|
|
|
| `v3-session-2026-10-22` | `c2664ac` | **Moving** session tag. Advanced several times and force-pushed to the final commit. |
|
|
|
| `v3-session-2026-10-22-final` | `0e81019` | **Early checkpoint** created before the session continued (byte/word16/SysClock/smallfix came after). Historical noise now. |
|
|
|
| `v3-session-2026-10-22-end` | `c2664ac` | **Final immutable session tag.** Use this one. |
|
|
|
@@ -116,18 +119,20 @@ 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` = 324 (322 `v3-*`) is expected; only the
|
|
|
+`git tag --list | wc -l` = 327 (325 `v3-*`) is expected; only the
|
|
|
recent ones above matter for the current session.
|
|
|
|
|
|
## Current state
|
|
|
|
|
|
-- `master` = current docs commit (library folders + tag map),
|
|
|
- **12 commits ahead** of `origin/master` (`6e40e26`): M5/M6, LFLOAT,
|
|
|
- triage, library folders and this tag map.
|
|
|
+- `master` = current docs commit (separate compilation + tag map),
|
|
|
+ **15 commits ahead** of `origin/master` (`6e40e26`): M5/M6, LFLOAT,
|
|
|
+ triage, library folders, separate compilation and this tag map.
|
|
|
- `v3-open-arrays-m5/m6`, `v3-open-arrays`, `v3-lfloat`,
|
|
|
- `v3-corpus-triage-2026-10-24`, `v3-library-folders` and their
|
|
|
- summary/session tags are local; push them with `master` when ready.
|
|
|
- Tags through M4 are already on the remote.
|
|
|
+ `v3-corpus-triage-2026-10-24`, `v3-library-folders`,
|
|
|
+ `v3-separate-compilation` and their summary/session tags are local;
|
|
|
+ push them with `master` when ready. Tags through M4 are already on
|
|
|
+ the remote.
|
|
|
- Next session: start from `master` and read
|
|
|
- `docs/handoff-2026-10-23-next.md`; continue with open-array M5
|
|
|
- (records/constructors) and the optional pointer-based 1-D view.
|
|
|
+ `docs/handoff-2026-10-23-next.md`; fill separate-compilation gaps
|
|
|
+ (`M2 -I` import scanning, incremental objects, generic instances,
|
|
|
+ per-object self-host).
|
