|
|
@@ -1,9 +1,10 @@
|
|
|
# Git branches and tags — how this repository is organised
|
|
|
|
|
|
-**Snapshot:** 2026-10-23, after `v3-ptrchain`. `master` =
|
|
|
-`e804e57` (the pointer-chain fix) plus this map update;
|
|
|
-`origin/master` = `a02e24c`. The pointer-chain fix and its docs are local and **not pushed yet**;
|
|
|
-M1–M5 are on the remote. 305 tags (303 `v3-*` checkpoints).
|
|
|
+**Snapshot:** 2026-10-23, after `v3-function-exception`. `master` =
|
|
|
+`4238f67` (the functionException fix) plus a docs follow-up;
|
|
|
+`origin/master` = `5c92728`. The functionException fix and README/docs
|
|
|
+are local and **not pushed yet**; M1–M5 and `v3-ptrchain` are on the
|
|
|
+remote. 306 tags (304 `v3-*` checkpoints).
|
|
|
|
|
|
Mental model:
|
|
|
|
|
|
@@ -14,7 +15,7 @@ Mental model:
|
|
|
|
|
|
| Branch | State | What it is |
|
|
|
| --- | --- | --- |
|
|
|
-| **`master`** | `e804e57` + docs, 2 commits ahead of origin | The only active branch; all current work is here. |
|
|
|
+| **`master`** | `4238f67` + docs, 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. |
|
|
|
@@ -46,6 +47,7 @@ Each points at the commit that landed a feature, all with green gates:
|
|
|
| `v3-packedset` | `6b2df4c` | ISO `PACKEDSET`, 1/2/4-byte storage |
|
|
|
| `v3-exceptions` | `02b3763` | ISO exceptions M1–M4: parser, runtime, libraries, traps |
|
|
|
| `v3-ptrchain` | `e804e57` | self-referential record layout and `p^.next^.value` |
|
|
|
+| `v3-function-exception` | `4238f67` | result function falling off its end |
|
|
|
|
|
|
These are immutable checkpoints. Useful commands:
|
|
|
|
|
|
@@ -87,19 +89,20 @@ git tag -d v3-session-2026-10-22-final
|
|
|
git push origin :refs/tags/v3-session-2026-10-22-final
|
|
|
```
|
|
|
|
|
|
-## Why 305 tags?
|
|
|
+## Why 306 tags?
|
|
|
|
|
|
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` = 305 (303 `v3-*`) is expected; only the
|
|
|
+`git tag --list | wc -l` = 306 (304 `v3-*`) is expected; only the
|
|
|
recent ones above matter for the current session.
|
|
|
|
|
|
## Current state
|
|
|
|
|
|
-- `master` = `e804e57` + docs, **2 commits ahead** of
|
|
|
- `origin/master` (`a02e24c`).
|
|
|
-- `v3-ptrchain` is local; push it with `master` when ready. Earlier
|
|
|
- exceptions/PACKEDSET/history tags are already on the remote.
|
|
|
+- `master` = `4238f67` + docs, **2 commits ahead** of
|
|
|
+ `origin/master` (`5c92728`).
|
|
|
+- `v3-function-exception` is local; push it with `master` when ready.
|
|
|
+ `v3-ptrchain` and the exceptions/PACKEDSET/history tags are already
|
|
|
+ on the remote.
|
|
|
- Next session: start from `master` and read
|
|
|
`docs/handoff-2026-10-23-next.md`.
|