diff options
| author | Chris Aniszczyk <caniszczyk@gmail.com> | 2010-08-30 16:59:15 -0400 |
|---|---|---|
| committer | Code Review <codereview-daemon@eclipse.org> | 2010-08-30 16:59:15 -0400 |
| commit | 77f79659f575dd8b8739707e6c8ddba51d765c78 (patch) | |
| tree | 0865293be578612ef01eec51013056bb9d5619ac | |
| parent | fb1c7b136f27abc234b8d71dce2160ad4467341b (diff) | |
| parent | 0bdf73db7f0b5cc4650a50b3fd657bc7cf35fab6 (diff) | |
| download | jgit-77f79659f575dd8b8739707e6c8ddba51d765c78.tar.gz jgit-77f79659f575dd8b8739707e6c8ddba51d765c78.zip | |
Merge "Add one more test to ReadTreeTest"
| -rw-r--r-- | org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ReadTreeTest.java | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ReadTreeTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ReadTreeTest.java index 22430e6858..cb82389f6a 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ReadTreeTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ReadTreeTest.java @@ -657,6 +657,20 @@ public abstract class ReadTreeTest extends RepositoryTestCase { assertTrue(new File(trash, "foo").isFile()); } + public void testDontOverwriteDirtyFile() throws IOException { + setupCase(mk("foo"), mk("other"), mk("foo")); + writeTrashFile("foo", "different"); + try { + checkout(); + fail("Didn't got the expected conflict"); + } catch (CheckoutConflictException e) { + assertIndex(mk("foo")); + assertWorkDir(mkmap("foo", "different")); + assertTrue(getConflicts().equals(Arrays.asList("foo"))); + assertTrue(new File(trash, "foo").isFile()); + } + } + /** * The interface these tests need from a class implementing a checkout */ |