Ability to merge release back to develop #291
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This preserves the correct version when merging a release back into develop. This also changes the semantics of the 0+1 part of the semantic version so that it represents the number of changes since the previous tagged release (e.g. version 1.0.0-beta.1+5 gets reset to 1.0.0-beta.2+0)
This was referenced Nov 8, 2014
| @@ -41,6 +37,11 @@ public bool FindVersion(GitVersionContext context, out SemanticVersion semanticV | |||
| return true; | |||
| } | |||
|
|
|||
| SemanticVersionPreReleaseTag CreateDefaultPreReleaseTag(GitVersionContext context, string versionString) | |||
| { | |||
| return context.CurrentBranch.Name.Replace("-" + versionString, string.Empty) + ".1"; | |||
There was a problem hiding this comment.
Should this be - or /
Thinking about it, our tests should verify both. I might do that in a separate PR
There was a problem hiding this comment.
Yeah, I'm not sure. I kept the existing behavior, just extracted it to a method.
JakeGinnivan
added a commit
that referenced
this pull request
Nov 16, 2014
Ability to merge release back to develop
|
Sweet, thanks for this |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This preserves the correct version when merging a release back into develop.
There are some behavioral changes as shown in the edited tests:
The behavior of the +n CommitsSinceTag metadata is changed to actually represent the commits since last tag. This means that this number gets reset to zero on change of PreReleaseTag. For instance, version 1.0.0-beta.1+5 gets reset to 1.0.0-beta.2+0 for the next commit after the 1.0.0-beta.1 tag). When only one tag is present, (i.e. the first tag in the release branch) it reverts to the previous behavior which is to indicate the number of commits since the creation of the release branch.