The rebase is what was run, so it is what the note says
The what-was-run paragraph counted three commits and no rebase. It is five commits and a rebase onto the defvar-dyn lane now, whose load.ml and ast.ml arms sit beside the four this lane added and were read against them by hand rather than left to the auto-merge.
This commit is contained in:
parent
ac7608f94b
commit
bd29eee3e4
12
FIX.org
12
FIX.org
@ -1566,8 +1566,12 @@ inspector reads.
|
||||
what crosses the wire is a typed 1.
|
||||
|
||||
** What was run
|
||||
~dune test --root .~ green (exit 0, no FAIL lines) after each of the three
|
||||
commits. Three acceptance rows for ~test/programs/dyn-class.flan~ — default,
|
||||
~-O0~ and ~--x86~ — and a three-way diff of the program's real output across
|
||||
the same three, captured by hand before the rows were written. It is in
|
||||
~dune test --root .~ green (exit 0, no FAIL lines) after each commit, and
|
||||
again on the rebase onto the defvar-dyn lane — whose ~load.ml~ arms are the
|
||||
~defvar~ one and whose ~ast.ml~ arm is the ~Ambiguous~ initialiser, disjoint
|
||||
from the four class arms beside them; both sets were read against each other
|
||||
by hand rather than trusted to the auto-merge. Three acceptance rows for
|
||||
~test/programs/dyn-class.flan~ — default, ~-O0~ and ~--x86~ — and a three-way
|
||||
diff of the program's real output across the same three, captured by hand
|
||||
before the rows were written and again after the rebase. It is in
|
||||
~test_sanitize.ml~'s list; per the sweep policy the sweep itself was not run.
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user