diff options
| author | Mathias Kinzler <mathias.kinzler@sap.com> | 2010-12-01 15:08:07 +0100 |
|---|---|---|
| committer | Mathias Kinzler <mathias.kinzler@sap.com> | 2010-12-01 15:08:07 +0100 |
| commit | 7aa1b85821e007c0243772273960069497284290 (patch) | |
| tree | bb8876529c5aa31b912998db555787510d6d15fe /org.eclipse.jgit.test | |
| parent | b4359cb8294de1e80147f00caabad9ebd6b7bce1 (diff) | |
| download | jgit-7aa1b85821e007c0243772273960069497284290.tar.gz jgit-7aa1b85821e007c0243772273960069497284290.zip | |
Rebase Interoperability first part: write "interactive" file
The Repository is then in state "Rebase interactive".
Change-Id: I5d2de57f8670e1d4c71ed22509ab17f04e2561b5
Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>
Diffstat (limited to 'org.eclipse.jgit.test')
| -rw-r--r-- | org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RebaseCommandTest.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RebaseCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RebaseCommandTest.java index 2e04cdb1bd..d1d3480b23 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RebaseCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RebaseCommandTest.java @@ -322,7 +322,8 @@ public class RebaseCommandTest extends RepositoryTestCase { checkFile(theFile, "<<<<<<< OURS\n1master\n=======\n1topic\n>>>>>>> THEIRS\n2\n3\ntopic4\n"); - assertEquals(RepositoryState.REBASING_MERGE, db.getRepositoryState()); + assertEquals(RepositoryState.REBASING_INTERACTIVE, db + .getRepositoryState()); assertTrue(new File(db.getDirectory(), "rebase-merge").exists()); // the first one should be included, so we should have left two picks in // the file @@ -410,7 +411,8 @@ public class RebaseCommandTest extends RepositoryTestCase { assertEquals(Status.STOPPED, res.getStatus()); assertEquals(conflicting, res.getCurrentCommit()); - assertEquals(RepositoryState.REBASING_MERGE, db.getRepositoryState()); + assertEquals(RepositoryState.REBASING_INTERACTIVE, db + .getRepositoryState()); assertTrue(new File(db.getDirectory(), "rebase-merge").exists()); // the first one should be included, so we should have left two picks in // the file |