-
Notifications
You must be signed in to change notification settings - Fork 640
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Support merging a release branch back to develop but maintain the version #199
Conversation
|
||
//merge down to develop | ||
fixture.Repository.Checkout("develop"); | ||
fixture.Repository.MergeNoFF("release-2.0.0", Constants.SignatureNow()); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This will cause develop's version to bump? Everything else looks good to me
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm, I thought only merges back to master would bump?
But in our case it wouldn't really be an issue if develop jumped to 2.1.0 in this case since that would be the correct next version for develop
Sent from my iPhone
On 01 Jul 2014, at 19:18, Jake Ginnivan notifications@github.com wrote:
In AcceptanceTests/GitHubFlow/ReleaseBranchTests.cs:
fixture.Repository.CreateBranch("release-2.0.0");
fixture.Repository.Checkout("release-2.0.0");
fixture.Repository.MakeCommits(1);
VerifyVersion(fixture, "2.0.0-beta.1+1");
//tag it to bump to beta 2
fixture.Repository.ApplyTag("2.0.0-beta1");
fixture.Repository.MakeCommits(1);
VerifyVersion(fixture, "2.0.0-beta.2+2");
//merge down to develop
fixture.Repository.Checkout("develop");
This will cause develop's version to bump? Everything else looks good to mefixture.Repository.MergeNoFF("release-2.0.0", Constants.SignatureNow());
—
Reply to this email directly or view it on GitHub.
Ping @nulltoken , how hard would this be to support? |
The problem is that the current code only goes back The use case is completely valid in my opinion. Release branches can often be moderately long-lived during a QA process, and merging hotfixes back into the develop without resetting release version is crucial. I'm not sure why we have to limit the search for tags by nbHotfixCommits. In a modified version of the code we are running, we have switched to simply enumerating all the tags that parse as
The full semver of the next commit would be:
and the commit after that would be:
The +1 would roll back to 0 for I can clean up the code and submit a pull request for this if desired, I'd have to check and make sure this would not affect anything else. |
I have created a pull request for my proposed changes: |
This is still WIP
We have a situation where stabilizing majors we want to merge a release branch down to develop but then keep working on it. When this is done the versioning resets back to x.y.z-beta.0+1 and ignores any prerelease tags.
I remember talking with @nulltoken about this and we said it wasn't a valid use case.
@nulltoken can you take a look at this and see if its even possible to support this? (see the failing test)
cc @SimonCropp @johnsimons @JakeGinnivan