-
Notifications
You must be signed in to change notification settings - Fork 650
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
[Bug] wrong patch count after merging Release branch #3422
Labels
Milestone
Comments
Hi @tomtom1976 . Thank's for your input. What version you are using? May I ask you to create a integration test for your scenario? It helps us alot. Please use the latest main branch which targeting the next release version 6.x. [Test]
public void Just_A_Test()
{
// * 2373a87 58 minutes ago (HEAD -> main)
var configuration = GitFlowConfigurationBuilder.New
.WithVersioningMode(VersioningMode.ContinuousDeployment)
.WithBranch("main", builder => builder
.WithLabel("ci")
.WithVersioningMode(VersioningMode.ContinuousDeployment)
)
.Build();
using var fixture = new EmptyRepositoryFixture();
fixture.MakeACommit();
// ✅ succeeds as expected
fixture.AssertFullSemver("0.0.1-ci.1", configuration);
// or
// ❌ expected: 0.0.1-ci.5"
fixture.AssertFullSemver("0.0.1-ci.1", configuration);
fixture.Repository.DumpGraph();
} |
I think it will be solved with #3438. @tomtom1976 please confirm |
5 tasks
🎉 This issue has been resolved in version 6.0.0-beta.2 🎉 Your GitReleaseManager bot 📦🚀 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Describe the bug
After merging a feature branch to the main and merge back the main to development
the version number is build correct to 1.1.0 but the patches not.
GitVersion counts all commits after branching the develoment from the main
Expected Behavior
A Version number like 1.1.0-alpha.1 or like that
Actual Behavior
1.1.0-alpha.6 <- all commit after branching from master
The text was updated successfully, but these errors were encountered: