You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
I'm having an issue where the BranchConfigurationCalculator will throw when develop is merged to a long running feature without any commits in the feature and within the develop branch.
I've tried to reproduce the issue within a test case but I'm not sure about the final assert?
I've also added some comments that if presents will make GV work.
I think this is releated to #453 but for feature branches.
[Test]publicvoidShouldBePossibleToMergeDevelopForALongRunningBranch(){using(varfixture=new EmptyRepositoryFixture(new Config(){VersioningMode= VersioningMode.ContinuousDeployment })){
fixture.Repository.MakeATaggedCommit("v1.0.0");
fixture.Repository.CreateBranch("develop");
fixture.Repository.Checkout("develop");
fixture.Repository.CreateBranch("feature/longrunning");
fixture.Repository.Checkout("feature/longrunning");
fixture.Repository.MakeACommit();
fixture.Repository.Checkout("develop");
fixture.Repository.MakeACommit();
fixture.Repository.Checkout("master");
fixture.Repository.Merge(fixture.Repository.FindBranch("develop"), SignatureBuilder.SignatureNow());
fixture.Repository.ApplyTag("v1.1.0");/* NOTE: Adding a commit to develop and the version finder will not throw { fixture.Repository.Checkout("develop"); fixture.MakeACommit(); fixture.AssertFullSemver("1.2.0-unstable.1"); } */
fixture.Repository.Checkout("feature/longrunning");
fixture.Repository.Merge(fixture.Repository.FindBranch("develop"), SignatureBuilder.SignatureNow());/* NOTE: adding a commit to the feature and the version finder will not throw, this is our workaround after * develop has been integrated into a longrunning branch. { fixture.Repository.MakeACommit(); } *//* First of all im not sure about the assertion here, but it will throw before... */
fixture.AssertFullSemver("1.2.0-longrunning.2");}}
The text was updated successfully, but these errors were encountered:
orjan
changed the title
Calucation of branch configuration will fail if master and develop is equal and is integrated in a feature branch.
Calculation of branch configuration will fail if master and develop is equal and is integrated in a feature branch.
Aug 15, 2015
orjan
added a commit
to orjan/GitVersion
that referenced
this issue
Aug 17, 2015
This fixes the issue where the BranchConfigurationCalulator thrown an
exception if develop and master are equal and re-integrated into a long
running feature branch.
FixesGitTools#568
I'm having an issue where the BranchConfigurationCalculator will throw when develop is merged to a long running feature without any commits in the feature and within the develop branch.
This line of code will throw since both develop and master is pointing at the same commit.
https://github.com/GitTools/GitVersion/blame/master/src/GitVersionCore/BranchConfigurationCalculator.cs#L53
I've tried to reproduce the issue within a test case but I'm not sure about the final assert?
I've also added some comments that if presents will make GV work.
I think this is releated to #453 but for feature branches.
The text was updated successfully, but these errors were encountered: