hpi-swa / Squot

Squeak Object Tracker - Version control for arbitrary objects, currently with Git storage
Other
57 stars 29 forks source link

Switch branch also saves and reverts ignored changes #353

Open j4yk opened 2 years ago

j4yk commented 2 years ago

Scenario: some method or class changes are ignored because they are just for local development (e. g. extra asserts and isThisEverCalleds) and not to be committed. A new feature is started but not finished and no commit was made yet. To work on something else, a new branch is created to hold the unsaved changes for the new feature, to then switch back to the previous branch to start something else there.

Would be nice if the ignored changes for local development would stay when the branch is switched, because they do not belong to the feature that the branch stands for, and reverting these changes if they are of a general nature does not make sense here.

Currently ignored changes are saved as unsaved changes to the temporary Git refs on top of the new branch, and after switching to the other branch, the ignored changes are no longer loaded.