]> source.dussan.org Git - jgit.git/commit
Implement a Dircache checkout (needed for merge) 25/825/18
authorChristian Halstrick <christian.halstrick@sap.com>
Fri, 11 Jun 2010 05:33:16 +0000 (07:33 +0200)
committerMatthias Sohn <matthias.sohn@sap.com>
Fri, 27 Aug 2010 14:06:49 +0000 (16:06 +0200)
commit2059ed205ebdf1b6837077db6cea6d29a4fbcf4a
tree9df6a53a56c6a4f0dc51c9abba378e9c940f9a17
parent0e7a38b60fbb88db4c61fd185ec17416540463d2
Implement a Dircache checkout (needed for merge)

Implementation of a checkout (or 'git read-tree') operation which
works together with DirCache. This implementation does similar things
as WorkDirCheckout which main problem is that it works with deprecated
GitIndex. Since GitIndex doesn't support multiple stages of a file
which is required in merge situations this new implementation is
required to enable merge support.

Change-Id: I13f0f23ad60d98e5168118a7e7e7308e066ecf9c
Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/DirCacheCheckoutTest.java [new file with mode: 0644]
org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ReadTreeTest.java
org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties
org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java
org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java [new file with mode: 0644]
org.eclipse.jgit/src/org/eclipse/jgit/errors/IndexWriteException.java [new file with mode: 0644]