github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-10-29 05:50:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'iop-vc-selective-merge' into iop-vc-preview

Browse Source
This commit is contained in:
Álvaro Tejero Cantero 2026-10-06 20:23:03 +02:00
commit 9e396c1feb
No known key found for this signature in database
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/app/main/data/workspace/branches.cljs
View File

@ -412,7 +412,7 @@
(let [excluded (or excluded #{})
include? (if (some? include?)
include?
(not (every? excluded change-keys)))]
(every? excluded change-keys))]
(if include?
(apply disj excluded change-keys)
(into excluded change-keys)))))))))

3
frontend/test/frontend_tests/data/workspace_branches_test.cljs
View File

@ -187,7 +187,8 @@
(t/testing "the other direction starts the selection over"
(ptk/emit! store (dwb/fetch-branch-diff (:id branch) :main->branch))
(t/is (= #{} (get-in @store [:workspace-branch-diff :excluded]))))
(rx/dispose! store)))
(rx/dispose! store))
(done'))
done))))
(t/deftest the-selection-travels-with-the-merge-and-update-calls