novox/mesh-catalog
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The vault's claim, its own event names, and the uplink holders' capabilities return #207

Merged
mesh-admin merged 2 commits from fix/the-vaults-claim-and-events-return into main 2026-10-01 15:19:56 +00:00
Conversation 0 Commits 2 Files Changed 6
+26 -17
mesh-admin commented 2026-10-01 15:19:50 +00:00
Contributor
Copy Link
Copy Source

My split of #205/#206 was wrong: the two branches shared an ancestor holding both changes and each reset the other's files, so the three-way merge of #206 removed the vault's claim and event names that #205 had landed and did not bring the uplink capabilities either. Main held neither, and the vault could not be built. This restores both halves to exactly what the two PRs described. Verified with git diff origin/main: six files, the vault's three and the three uplink definitions.

My split of #205/#206 was wrong: the two branches shared an ancestor holding both changes and each reset the other's files, so the three-way merge of #206 removed the vault's claim and event names that #205 had landed and did not bring the uplink capabilities either. Main held neither, and the vault could not be built. This restores both halves to exactly what the two PRs described. Verified with `git diff origin/main`: six files, the vault's three and the three uplink definitions.
mesh-admin added 2 commits 2026-10-01 15:19:50 +00:00
The vault's claim and its own event names return 89e0dde9e0 
The uplink branch was split from the vault's with the vault's files reset to a main that did not yet
hold #205; merging it afterwards took the older vault definition along (no claim, the refused event
names), and the vault could not be built. Restored to #205's state.
And the uplink holders' capabilities return 01d68bda88 
The same split lost them the other way round: the merge base held both changes, each branch had reset
the other's files, and the three-way merge kept neither. Both halves of hq ADR 0161 are on main again
with this.
mesh-admin merged commit 0c521ffa20 into main 2026-10-01 15:19:56 +00:00
mesh-admin deleted branch fix/the-vaults-claim-and-events-return 2026-10-01 15:19:56 +00:00
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
No items
No labels
Milestone
No items
No Milestone
Projects
Clear projects
No projects
Assignees
Clear assignees
jschoubben miel.truyen
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: novox/mesh-catalog#207