Repository navigation
Commit 4738679
fix(fork-sync): the license merge keys an unnamed entry on its repositoryUrl (#1616)
> 🤖 claude/anthropic claude-opus-5-5 (high)
## Problem
The sync's license resolver keys `third-party-licenses.config.json` entries on `name`.
Upstream's `packageOverrides` now has 5 entries with only `repositoryUrl`, so the resolver refuses every conflict on that file.
The `.2638` sync's license conflict had to be merged by hand.
## Change
An entry's key is its `name`, or its `repositoryUrl` when it has no name.
An entry with neither still refuses.
## Scope and approval
Follow-up F2 from the `.2638` UAT, #1607, accepted by the maintainer.
Not covered: the landing rerun's rewrite of one `é` escape to a literal character (same JSON, different bytes).
## Verification
| check | result |
| --- | --- |
| `vp test run scripts/lib/fork-license-merge.test.ts` | 8 passed, 1 new |
| Merge of trunk's real config with itself | merged, JSON equal; refused before |
| `vp run fork:ci` | exit 0; scripts 732/732 |
Claude Opus 5.5 in Claude Code, inside T3 Code.
## Fork trailers
Squashes:
- 2d609f2 fix(fork-sync): the license merge keys an unnamed entry on its repositoryUrl (#1616) (#1616)
- 7299065 fixup! fix(fork-sync): the license merge keys an unnamed entry on its repositoryUrl (#1616) (#1616)
Fork-Domain: fork-meta
Fork-Tier: core
Fork-Upstreamable: no1 parent f722f9e commit 4738679
2 files changed
Lines changed: 35 additions & 12 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
72 | 72 | | |
73 | 73 | | |
74 | 74 | | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
75 | 95 | | |
76 | 96 | | |
77 | 97 | | |
| |||
105 | 125 | | |
106 | 126 | | |
107 | 127 | | |
108 | | - | |
| 128 | + | |
109 | 129 | | |
110 | 130 | | |
111 | 131 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
4 | | - | |
5 | | - | |
6 | | - | |
7 | | - | |
8 | | - | |
9 | | - | |
10 | | - | |
11 | | - | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
12 | 7 | | |
13 | 8 | | |
14 | 9 | | |
| |||
26 | 21 | | |
27 | 22 | | |
28 | 23 | | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
29 | 31 | | |
30 | 32 | | |
31 | 33 | | |
32 | | - | |
33 | | - | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
34 | 37 | | |
35 | 38 | | |
36 | 39 | | |
| |||
0 commit comments