Commit e545fe2
committed
chore(spec): regenerate the three ratchets after merging #4789 — its rename must not ride out on this branch
`git merge origin/main` brought in #4789 (kernel PackageDependencySchema ->
ResolvedPackageDependencySchema, dual-source C7), which touches the same three
generated artifacts this branch does. The merge reported NO conflicts and left
NO conflict markers, and it was wrong in all three:
api-surface.json re-added `PackageDependency (type)` +
`PackageDependencySchema (const)` and dropped
`ResolvedPackageDependency(Schema)`
authorable-surface.json re-added the 4 `kernel/PackageDependency:*` lines and
dropped the 4 `kernel/ResolvedPackageDependency:*` ones
json-schema.manifest.json re-added `kernel/PackageDependency` and dropped
`kernel/ResolvedPackageDependency`
json-schema.manifest.json is routed to the `merge=os-regen` driver, which defers
rather than regenerates, so nothing textual signals this — the C17/C10 silent
revert, reproduced. `git merge-tree` does not run external merge drivers and so
cannot see it either.
Resolved the way #4783 did, without any textual merge: reset all three (plus
api-surface-signatures.json) to origin/main, re-applied ONLY this PR's own
deletion to the two hand-ratcheted files, then re-ran the generators over the
merged source. The 22 authorable-surface lines and 4 manifest keys are once
again deliberate deletions, now anchored at merge base ffab803, which
gen:schema re-proved under #4650 route 3 ("def no longer emitted by this
build").
Delta vs origin/main is now pure deletion in all three, with #4789's rename
intact:
api-surface.json -8 (4 const + 4 type), 0 insertions
authorable-surface.json -22 lines, 0 insertions
json-schema.manifest.json -4 keys, 0 insertions
check:dual-source-exports reports 0 accepted dual-source (#4789's shrink to []
survives; this branch does not carry it back to 2). renamed-defs.ts is
byte-identical to main and keeps all 6 entries including #4789's.
Co-Authored-By: Claude <noreply@anthropic.com>1 parent e79e2fb commit e545fe2
3 files changed
Lines changed: 7 additions & 7 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1657 | 1657 | | |
1658 | 1658 | | |
1659 | 1659 | | |
1660 | | - | |
1661 | 1660 | | |
1662 | 1661 | | |
1663 | 1662 | | |
1664 | 1663 | | |
1665 | | - | |
1666 | 1664 | | |
1667 | 1665 | | |
1668 | 1666 | | |
| |||
1790 | 1788 | | |
1791 | 1789 | | |
1792 | 1790 | | |
| 1791 | + | |
| 1792 | + | |
1793 | 1793 | | |
1794 | 1794 | | |
1795 | 1795 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4679 | 4679 | | |
4680 | 4680 | | |
4681 | 4681 | | |
4682 | | - | |
4683 | | - | |
4684 | | - | |
4685 | | - | |
4686 | 4682 | | |
4687 | 4683 | | |
4688 | 4684 | | |
| |||
4998 | 4994 | | |
4999 | 4995 | | |
5000 | 4996 | | |
| 4997 | + | |
| 4998 | + | |
| 4999 | + | |
| 5000 | + | |
5001 | 5001 | | |
5002 | 5002 | | |
5003 | 5003 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
980 | 980 | | |
981 | 981 | | |
982 | 982 | | |
983 | | - | |
984 | 983 | | |
985 | 984 | | |
986 | 985 | | |
| |||
1039 | 1038 | | |
1040 | 1039 | | |
1041 | 1040 | | |
| 1041 | + | |
1042 | 1042 | | |
1043 | 1043 | | |
1044 | 1044 | | |
| |||
0 commit comments