In place release and release candidate

[baby-gnu]

Hello,

I wonder if the in-place release should be merge with the develop branch.

My use case is the following:

git flow release start 1.3
<fix things>
git flow release finish -i -m 'Release candidate 1' 1.3-rc1
<fix things>
git flow release finish -i -m 'Release candidate 2' 1.3-rc2
<nothing to fix>
git flow release finish -m "Release 1.3.0" 1.3.0

Or maybe a subcommande candidate() to tag the rc but do not merge in the develop branch?

Regards.

[petervanderdoes]

As I'm going through the code after reading this, I'm not sure I understand the following bit:

if flag inplace; then
    BRANCH="$(git_current_branch)"

The git_current_branch is not correct, the in-place release should release the develop branch, not the branch you are currently on, according to the original issue #133 and that means it would never have to merge back in the develop branch but it actually should merge in the master branch. Argh, so much going through my head that I created a separate issue #22 for this bit.

In your case, I always read the model as follows:
Master is production ready
Release branch if for Release Candidates.
And I would handle it as follow:

git flow release start 1.3
git tag 1.3-rc1
git push origin 1.3-rc1
<fix things>
git tag 1.3-rc2
git push origin 1.3-rc2
git push origin release/1.3
<fix things>
git tag 1.3-rc3
git push origin 1.3-rc3
git push origin release/1.3
<nothing to fix>
git flow release finish -m "Release 1.3.0" 1.3.0

I guess a new sub-command could be create

git flow release candidate <version>

[petervanderdoes]

Closing this issue in favor of following issue #22