Demonstration of bugs for issues 1526 & 1526

Author: Dominique St-Amand

src/GitVersionCore.Tests/IntegrationTests/DevelopScenarios.cs

@@ -289,5 +289,41 @@ public void PreviousPreReleaseTagShouldBeRespectedWhenCountingCommits()
 
             fixture.AssertFullSemver("1.0.0-alpha.5");
         }
+
+    [Test]
+    public void CommitsSinceVersionSourceGoesDownWhenDeletingAReleaseBranch()
+    {
+        var config = new Config
+        {
+            VersioningMode = VersioningMode.ContinuousDeployment
+        };
+
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.MakeACommit();
+        fixture.ApplyTag("1.1.0");
+        fixture.BranchTo("develop");
+        fixture.MakeACommit("commit in develop");
+        fixture.BranchTo("feature/featureA");
+        fixture.MakeACommit("commit in featureA");
+        fixture.MakeACommit("commit in featureA");
+        fixture.Checkout("develop");
+        fixture.MakeACommit("commit in develop");
+        fixture.MakeACommit("commit in develop");
+        fixture.BranchTo("release/1.2.0");
+        fixture.MakeACommit("commit in release/1.2.0");
+        fixture.Checkout("feature/featureA");
+        fixture.MergeNoFF("develop");
+        fixture.Checkout("develop");
+        fixture.MergeNoFF("feature/featureA");
+        fixture.Checkout("master");
+        fixture.MergeNoFF("release/1.2.0");
+        fixture.ApplyTag("1.2.0");
+        fixture.Checkout("develop");
+        fixture.MergeNoFF("release/1.2.0");
+        fixture.SequenceDiagram.Destroy("release/1.2.0");
+        fixture.Repository.Branches.Remove("release/1.2.0");
+
+        var expectedFullSemVer = "1.3.0-alpha.6";
+        fixture.AssertFullSemver(config, expectedFullSemVer);
     }
 }

src/GitVersionCore.Tests/IntegrationTests/FeatureBranchScenarios.cs

@@ -295,6 +295,32 @@ public void ShouldPickUpVersionFromDevelopAfterReleaseBranchMergedBack()
             fixture.AssertFullSemver("1.1.0-test.1+2");
         }
 
+	    [Test]
+	    public void MergingFromDevelopToFeatureShouldNotCauseMinorPatchToChange()
+	    {
+	        var config = new Config
+	        {
+	            VersioningMode = VersioningMode.ContinuousDeployment
+	        };
+
+	        using var fixture = new EmptyRepositoryFixture();
+	        fixture.MakeACommit();
+	        fixture.ApplyTag("1.1.0");
+	        fixture.BranchTo("develop");
+	        fixture.MakeACommit("commit in develop");
+	        fixture.BranchTo("feature/featureA");
+	        fixture.MakeACommit("commit in featureA");
+	        fixture.MakeACommit("commit in featureA");
+	        fixture.Checkout("develop");
+	        fixture.MakeACommit("commit in develop");
+	        fixture.MakeACommit("commit in develop");
+	        fixture.Checkout("feature/featureA");
+	        fixture.MergeNoFF("develop");
+
+	        var expectedFullSemVer = "1.2.0-featureA.5";
+	        fixture.AssertFullSemver(config, expectedFullSemVer);
+	    }
+
         public class WhenMasterMarkedAsIsDevelop
         {
             [Test]