mirrors/jgit - jgit - source @ dussan.org

Cronologia

Christian Halstrick af40635aba Fix handling of file/folder conflicts during a checkout JGit was not handling certain file/folder conflicts during a checkout correctly. This was reported by Axel Richard in http://dev.eclipse.org/mhonarc/lists/jgit-dev/msg02358.html. This commit fixes this problem. Still JGit behaves intentionally different than native git. If HEAD contains a tree, and workingtree, Index and Merge contain a file with same content ... then JGit allows a conflict free checkout of Merge. Native git always complains that it doesn't want to overwrite local changes. But there is no need to update the working tree because Index and Merge are already equal. A shell script which shows how native git behaves can be found here. https://gist.github.com/chalstrick/7694959#file-gistfile1-sh Change-Id: Ifd6a68974d61cd4fa23bc575f3a40773db66cafc Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>		10 anni fa
..
BaseDirCacheEditor.java	Initial JGit contribution to eclipse.org	14 anni fa
DirCache.java	JGit 3.0: move internal classes into an internal subpackage	11 anni fa
DirCacheBuildIterator.java	Update example code for obtaining a locked DirCache	12 anni fa
DirCacheBuilder.java	Mark non-externalizable strings as such	11 anni fa
DirCacheCheckout.java	Fix handling of file/folder conflicts during a checkout	10 anni fa
DirCacheEditor.java	DirCacheEditor: Apply PathEdit for each stage	11 anni fa
DirCacheEntry.java	Mark non-externalizable strings as such	11 anni fa
DirCacheIterator.java	DirCacheIterator: Fix reset() and back()	11 anni fa
DirCacheTree.java	DirCacheIterator: Fix reset() and back()	11 anni fa
InvalidPathException.java	Add missing @since tags to mark API added in 2.0	12 anni fa
package-info.java	Add Javadoc description for packages	11 anni fa