mirror of
https://github.com/penpot/penpot.git
synced 2026-10-29 14:00:37 +00:00
6605968633
develop moved token activation out of the tokens lib into the document's :tokens-status (penpot/penpot#10293): ctob/get-active-theme-paths is gone, :set-active-token-themes is no longer a change type, and a set is activated by id in the status rather than through the hidden theme. The branch merge still read active theme paths off the lib, which on the JVM is a compile error in app.common.files.branch-merge and therefore stops every backend namespace that requires it from loading. The merge now reads both halves of activation off :tokens-status, as ids, and keeps the two conflict kinds and resolution keys the UI already offers (:active-themes, :active-sets). compute-changes settles each half by the rule it used before and emits one :set-tokens-status, because the change replaces the whole status. The hidden theme stays out of the theme diff, as before. The two activation tests now build the status with develop's own cfo/activate-set and cfo/activate-theme, and a third pins that a conflicting activation keeps main's status until a resolution takes the branch's. common-tests.files-branch-merge-test: 84 tests, 331 assertions, 0 failures. AI-assisted-by: claude-opus-5-5