Skip to content

Commit 727530e

Browse files
author
Mark Rydstrom
committed
Fix expected behavior in mainline test
The number of commits in a branch merged into master shouldn't change that we increment by a single version
1 parent ae26b81 commit 727530e

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/GitVersionCore.Tests/IntegrationTests/MainlineDevelopmentMode.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,9 +178,9 @@ public void VerifySupportForwardMerge()
178178
fixture.MakeACommit("+semver: minor");
179179
fixture.AssertFullSemver(config, "1.1.0");
180180
fixture.MergeNoFF("support/1.0");
181-
fixture.AssertFullSemver(config, "1.1.2");
181+
fixture.AssertFullSemver(config, "1.1.1");
182182
fixture.MakeACommit();
183-
fixture.AssertFullSemver(config, "1.1.3");
183+
fixture.AssertFullSemver(config, "1.1.2");
184184
fixture.Checkout("support/1.0");
185185
fixture.AssertFullSemver(config, "1.0.4");
186186

0 commit comments

Comments
 (0)