File tree Expand file tree Collapse file tree 1 file changed +0
-8
lines changed
GitVersionCore.Tests/IntegrationTests/GitFlow Expand file tree Collapse file tree 1 file changed +0
-8
lines changed Original file line number Diff line number Diff line change 1
1
using System . Linq ;
2
- using System . Threading ;
3
2
using LibGit2Sharp ;
4
3
using NUnit . Framework ;
5
4
@@ -36,14 +35,7 @@ public void PatchLatestReleaseExample()
36
35
fixture . Repository . Checkout ( "develop" ) ;
37
36
fixture . AssertFullSemver ( "1.3.0-unstable.0+0" ) ;
38
37
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 ) ;
45
38
fixture . Repository . MergeNoFF ( "hotfix-1.2.1" , Constants . SignatureNow ( ) ) ;
46
-
47
39
fixture . AssertFullSemver ( "1.3.0-unstable.1+1" ) ;
48
40
}
49
41
}
You can’t perform that action at this time.
0 commit comments