motiejus
/
jgit
1
Fork 0
Code Releases Activity

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>
This commit is contained in:
Mathias Kinzler 2010-12-01 15:08:07 +01:00
parent b4359cb829
commit 7aa1b85821
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RebaseCommandTest.java
View File

@ -322,7 +322,8 @@ public void testAbortOnConflict() throws Exception {
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 void testAbortOnConflictFileCreationAndDeletion() throws Exception {
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

1
org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java
View File

@ -325,6 +325,7 @@ private RebaseResult initFilesAndRewind() throws RefNotFoundException,
createFile(rebaseDir, "head", headId.name());
createFile(rebaseDir, "head-name", headName);
createFile(rebaseDir, "onto", upstreamCommit.name());
createFile(rebaseDir, "interactive", "");
BufferedWriter fw = new BufferedWriter(new OutputStreamWriter(
new FileOutputStream(new File(rebaseDir, "git-rebase-todo")),
"UTF-8"));