Community
Participate
Working Groups
I was going to see whether hotfixes are correctly handled, but upon switching to the master branch the option is not even available. Given that hotfixes are branched from master, this option should be available here! Indeed, all three "start x" options should always be available, and simply switch to the correct branch beforehand (i.e. develop for feature/release, master for hotfix).
> I was going to see whether hotfixes are correctly handled Did you try it on develop as well?
When on develop, start hotfix branches from master (correct). Finish hotfix is merging into develop (correct) and tagging develop (incorrect). Finish hotfix does not appear to merge to trunk (incorrect). So the solution for this issue is to make (at least) start hotfix option available on trunk - though ideally all "start x" options would be available whichever branch is active. The incorrect merging/tagging behaviour is a separate issue and can be covered by 473646 (I'll go add a relevant comment there).
> Finish hotfix does not appear to merge to trunk (incorrect). With 'trunk', do you mean master? This would be a serious issue. We probably should have a dedicated issue for this. > So the solution for this issue is to make (at least) start hotfix option available on trunk - though ideally all "start x" options would be available whichever branch is active. If these command are available in (one of) the CLI implementation, we should implement it as well. Otherwise, I think this is a minor issue. Personally, I spent very little time on the master branch, hence, having to switch to develop manually is a very minor inconvenience for me.
(In reply to Max Hohenegger from comment #3) > > So the solution for this issue is to make (at least) start hotfix option available on trunk - though ideally all "start x" options would be available whichever branch is active. > > If these command are available in (one of) the CLI implementation, we should > implement it as well. > Otherwise, I think this is a minor issue. Personally, I spent very little > time on the master branch, hence, having to switch to develop manually is a > very minor inconvenience for me. I double-checked. On the CLI (1.9.0-dev.33 (AVH Edition)), the start commands are indeed available.
I think rather than simply enabling all commands, it would be better to move those commands that require an intermediate step in the Gitflow "state-machine" to a sub-menu. E.g. when on a feature branch, I would expect to quickly find the "feature finish" or "rebase" operations, and, for example, "start hotifx" somewhere under "other options".
New Gerrit change created: https://git.eclipse.org/r/56778
Gerrit change https://git.eclipse.org/r/56778 was merged to [master]. Commit: http://git.eclipse.org/c/egit/egit.git/commit/?id=e4993d97de3f2f7a36f0c075227f809c69de8ae7
submitted
