|
|
@@ -1,9 +1,9 @@
|
|
|
# Git branches and tags — how this repository is organised
|
|
|
|
|
|
-**Snapshot:** 2026-10-24, after dynamic `SET OF CARDINAL`/`INTEGER`.
|
|
|
-`master` = the current dynamic-set/docs/tag-map commit;
|
|
|
+**Snapshot:** 2026-10-24, after the dynamic-set showcase.
|
|
|
+`master` = the current showcase/docs/tag-map commit;
|
|
|
`origin/master` = `b1d14f9` (the PDF comparison commit).
|
|
|
-335 tags (333 `v3-*` checkpoints).
|
|
|
+336 tags (334 `v3-*` checkpoints).
|
|
|
|
|
|
Mental model:
|
|
|
|
|
|
@@ -14,7 +14,7 @@ Mental model:
|
|
|
|
|
|
| Branch | State | What it is |
|
|
|
| --- | --- | --- |
|
|
|
-| **`master`** | current dynamic-set commit, 16 commits ahead of origin | The only active branch; all current work is here. |
|
|
|
+| **`master`** | current showcase commit, 18 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. |
|
|
|
@@ -70,6 +70,7 @@ Each points at the commit that landed a feature, all with green gates:
|
|
|
| `v3-language-robustness` | `1017487` | ADDRESS/pointer equality + language/robustness notes |
|
|
|
| `v3-wide-sets` | `31eaefe` | wide sets and bounded `SET OF CARDINAL` |
|
|
|
| `v3-dynamic-sets` | `34cd0a9` | sorted range lists for `SET OF CARDINAL`/`INTEGER` |
|
|
|
+| `v3-showcase25` | `d823a33` | dynamic-set/ADDRESS showcase and docs |
|
|
|
|
|
|
These are immutable checkpoints. Useful commands:
|
|
|
|
|
|
@@ -126,15 +127,15 @@ 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` = 335 (333 `v3-*`) is expected; only the
|
|
|
+`git tag --list | wc -l` = 336 (334 `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 **16 commits ahead**: P1, per-object fixpoint,
|
|
|
+ Local `master` is **18 commits ahead**: P1, per-object fixpoint,
|
|
|
ABI/class, generic-instance, generic-class, language/robustness,
|
|
|
- wide-set and dynamic-set feature/map commits.
|
|
|
+ wide-set/dynamic-set and showcase feature/map commits.
|
|
|
- The recent feature tags are local; push them with `master` when
|
|
|
ready.
|
|
|
- Next session: start from `master` and read
|
