Skip to content

Commit e7a5548

Browse files
committed
Found a workaround which is fixed now
1 parent 3705f6f commit e7a5548

File tree

1 file changed

+0
-8
lines changed

1 file changed

+0
-8
lines changed

GitVersionCore.Tests/IntegrationTests/GitFlow/PatchScenarios.cs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using System.Linq;
2-
using System.Threading;
32
using LibGit2Sharp;
43
using NUnit.Framework;
54

@@ -36,14 +35,7 @@ public void PatchLatestReleaseExample()
3635
fixture.Repository.Checkout("develop");
3736
fixture.AssertFullSemver("1.3.0-unstable.0+0");
3837

39-
// Warning: Hack-ish hack
40-
//
41-
// Ensure the merge commit is done at a different time than the previous one
42-
// Otherwise, as they would have the same content and signature, the same sha would be generated.
43-
// Thus 'develop' and 'master' would point at the same exact commit and the Assert below would fail.
44-
Thread.Sleep(1000);
4538
fixture.Repository.MergeNoFF("hotfix-1.2.1", Constants.SignatureNow());
46-
4739
fixture.AssertFullSemver("1.3.0-unstable.1+1");
4840
}
4941
}

0 commit comments

Comments
 (0)