Commit fe6cb32
committed
fix(prepare): a version conflict on a package with no C++ module says so
Two versions of one package are reconciled by mangling the secondary
copy's module names. The two branches that refuse name both versions and
who asked for them; the third reported only that the package declares no
named C++ module to rewrite, which is a true statement about a package
the reader never asked to be staged and says nothing about the conflict
that brought it there. A C package reaches it: compat.vulkan-runtime
compiles one C file, so a manifest that pins one version of it while a
dependency asks for another got a message about modules.
It now names both versions, both requesters, and what to do.
examples/10 moves its pin to compat.vulkan-runtime 2026.09.06, the
version compat.vulkan asks for since mcpp-index#350. The example is the
consumer that found this.1 parent 3306ac6 commit fe6cb32
3 files changed
Lines changed: 34 additions & 5 deletions
File tree
- .agents/docs
- examples/10-vulkan-compute/app
- src/build
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
31 | 31 | | |
32 | 32 | | |
33 | 33 | | |
34 | | - | |
35 | | - | |
36 | | - | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
37 | 39 | | |
38 | 40 | | |
39 | 41 | | |
| |||
142 | 144 | | |
143 | 145 | | |
144 | 146 | | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
145 | 154 | | |
146 | 155 | | |
147 | 156 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
25 | | - | |
| 25 | + | |
26 | 26 | | |
27 | 27 | | |
28 | 28 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5554 | 5554 | | |
5555 | 5555 | | |
5556 | 5556 | | |
5557 | | - | |
| 5557 | + | |
| 5558 | + | |
| 5559 | + | |
| 5560 | + | |
| 5561 | + | |
| 5562 | + | |
| 5563 | + | |
| 5564 | + | |
| 5565 | + | |
| 5566 | + | |
| 5567 | + | |
| 5568 | + | |
| 5569 | + | |
| 5570 | + | |
| 5571 | + | |
| 5572 | + | |
| 5573 | + | |
| 5574 | + | |
| 5575 | + | |
| 5576 | + | |
| 5577 | + | |
5558 | 5578 | | |
5559 | 5579 | | |
5560 | 5580 | | |
| |||
0 commit comments