motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge "Fix broken MergeCommandTest"

This commit is contained in:
Shawn Pearce 2010-11-09 18:58:34 -05:00 committed by Code Review
parent ab7d08ec96 2cba7b3522
commit 17b1003ff2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java
View File

@ -247,7 +247,7 @@ public void testSuccessfulContentMerge() throws Exception {
assertEquals(thirdCommit, newHead.getParent(0));
assertEquals(secondCommit, newHead.getParent(1));
assertEquals(
"merging 3fa334456d236a92db020289fe0bf481d91777b4 into HEAD",
"Merge commit '3fa334456d236a92db020289fe0bf481d91777b4' into HEAD",
newHead.getFullMessage());
// @TODO fix me
assertEquals(RepositoryState.SAFE, db.getRepositoryState());
@ -307,7 +307,7 @@ public void testSuccessfulContentMergeAndDirtyworkingTree()
assertEquals(thirdCommit, newHead.getParent(0));
assertEquals(secondCommit, newHead.getParent(1));
assertEquals(
"merging 064d54d98a4cdb0fed1802a21c656bfda67fe879 into HEAD",
"Merge commit '064d54d98a4cdb0fed1802a21c656bfda67fe879' into HEAD",
newHead.getFullMessage());
assertEquals(RepositoryState.SAFE, db.getRepositoryState());