ソースを参照

Merge "Adapt expected commit message in tests"

tags/v0.11.1
Chris Aniszczyk 13年前
コミット
80362df5aa
1個のファイルの変更2行の追加2行の削除
  1. 2
    2
      org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java

+ 2
- 2
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java ファイルの表示

@@ -364,7 +364,7 @@ public class MergeCommandTest extends RepositoryTestCase {
assertEquals(thirdCommit, newHead.getParent(0));
assertEquals(secondCommit, newHead.getParent(1));
assertEquals(
"Merge commit '3fa334456d236a92db020289fe0bf481d91777b4' into HEAD",
"Merge commit '3fa334456d236a92db020289fe0bf481d91777b4'",
newHead.getFullMessage());
// @TODO fix me
assertEquals(RepositoryState.SAFE, db.getRepositoryState());
@@ -425,7 +425,7 @@ public class MergeCommandTest extends RepositoryTestCase {
assertEquals(thirdCommit, newHead.getParent(0));
assertEquals(secondCommit, newHead.getParent(1));
assertEquals(
"Merge commit '064d54d98a4cdb0fed1802a21c656bfda67fe879' into HEAD",
"Merge commit '064d54d98a4cdb0fed1802a21c656bfda67fe879'",
newHead.getFullMessage());

assertEquals(RepositoryState.SAFE, db.getRepositoryState());

読み込み中…
キャンセル
保存