search

hpi-swa / Squot

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

Feature Request: "Create a new branch and switch to it, but keep uncommitted changes" #348

Open LinqLover opened 3 years ago

j4yk commented 3 years ago

...or the possibility to commit onto a new branch from the commit dialog, like in TortoiseGit.

LinqLover commented 3 years ago

Oh yes, this sounds also very helpful!

j4yk commented 2 years ago

Have just re-read the issue title: if you press the Branch button you can already accomplish what you describe. Give the new branch name, then choose "Switch and move over unsaved changes" (you get prompted for that right away, no need to invoke additional menus or so).

Is there something else you need to resolve this issue?

LinqLover commented 2 years ago

Ah, then I never dared to click this button because of this misconception! 😆 Maybe the item should be renamed to "Create a new branch and switch to it..." (note the ellipsis) then?

j4yk commented 2 years ago

I wonder whether an additional menu item is really required. What would be the benefit over using the button?

LinqLover commented 2 years ago

I wonder whether an additional menu item is really required. What would be the benefit over using the button?

Tbh I never used this button because I was always unsure whether it would base the new branch on the current working copy, the active branch, the currently selected branch, or the currently selected commit. :-) Maybe we should clarify this first by adding a longer help text to this button?

j4yk commented 2 years ago

I extended the help text.

j4yk commented 2 years ago

In case you want this feature for other commits than the head of the current branch, I would not like to put up a combinatorial explosion of the options in the commit list menu. I would instead propose to show the same prompt that appears if you used the Branch button.

LinqLover commented 2 years ago

Thanks for extending the help text!

In case you want this feature for other commits than the head of the current branch, I would not like to put up a combinatorial explosion of the options in the commit list menu. I would instead propose to show the same prompt that appears if you used the Branch button.

This sounds useful! As for prioritizing, this is a convenience issue only, as I can also use the branch button today and then reset the newly created branch to an older commit, right?