diff options
| -rw-r--r-- | org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/ReplaceActionsTest.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/ReplaceActionsTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/ReplaceActionsTest.java index acd81f9388..01d186e5a2 100644 --- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/ReplaceActionsTest.java +++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/ReplaceActionsTest.java @@ -69,13 +69,14 @@ public class ReplaceActionsTest extends LocalRepositoryTestCase { Git git = new Git(repo); Calendar cal = Calendar.getInstance(); + long time = cal.getTime().getTime(); PersonIdent sideCommitter = new PersonIdent("Side Committer", - "side@example.org", cal.getTime().getTime(), 0); + "side@example.org", time, 0); // Make sure commit time stamps are different, otherwise the order in // the dialog is not stable - cal.roll(Calendar.SECOND, 2); + time += 5000; PersonIdent masterCommitter = new PersonIdent("Master Committer", - "master@example.org", cal.getTime().getTime(), 0); + "master@example.org", time, 0); git.checkout().setCreateBranch(true).setName("side").call(); touch(PROJ1, "folder/test.txt", "side"); |