Repository navigation
Commit db3361c
committed
fix(shared): usage sources match on either legacy key or physical source
Two desktop installs on one PC persist different host scopes, so one
directory they both read carries two physical IDs but one legacy key.
Join sources when either key matches instead of letting the physical ID
override the legacy match.
AI-assisted; verified with the tests and tools listed above.1 parent 25b306f commit db3361c
2 files changed
Lines changed: 22 additions & 44 deletions
File tree
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
661 | 661 | | |
662 | 662 | | |
663 | 663 | | |
664 | | - | |
665 | | - | |
666 | | - | |
667 | | - | |
668 | | - | |
669 | | - | |
670 | | - | |
671 | | - | |
672 | | - | |
673 | | - | |
674 | | - | |
675 | | - | |
676 | | - | |
677 | | - | |
678 | | - | |
679 | | - | |
680 | | - | |
681 | | - | |
682 | | - | |
683 | | - | |
| 664 | + | |
684 | 665 | | |
685 | 666 | | |
686 | | - | |
| 667 | + | |
687 | 668 | | |
688 | | - | |
| 669 | + | |
689 | 670 | | |
690 | 671 | | |
691 | | - | |
| 672 | + | |
692 | 673 | | |
693 | 674 | | |
694 | | - | |
695 | 675 | | |
696 | 676 | | |
697 | 677 | | |
698 | 678 | | |
699 | | - | |
700 | | - | |
| 679 | + | |
| 680 | + | |
| 681 | + | |
701 | 682 | | |
702 | 683 | | |
703 | 684 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
118 | 118 | | |
119 | 119 | | |
120 | 120 | | |
121 | | - | |
122 | | - | |
123 | | - | |
124 | | - | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
125 | 124 | | |
126 | 125 | | |
127 | 126 | | |
128 | | - | |
129 | | - | |
130 | | - | |
131 | | - | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
132 | 135 | | |
133 | 136 | | |
134 | 137 | | |
135 | | - | |
136 | | - | |
137 | | - | |
138 | | - | |
139 | | - | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
140 | 141 | | |
141 | 142 | | |
142 | | - | |
143 | | - | |
144 | | - | |
145 | | - | |
146 | | - | |
| 143 | + | |
147 | 144 | | |
148 | 145 | | |
149 | 146 | | |
| |||
0 commit comments