Robin Stocker e623db0f87 Fix order of deletion for files/dirs in ResolveMerger ... Before, the paths to delete were stored in a HashMap, which doesn't have a particular order. So when e.g. both the file "a/b" and the directory "a" were to be deleted, it would sometimes try to delete "a" first. This resulted in a failed path because File#delete() fails when a directory isn't empty. With this change, an ArrayList is used for storing the paths to delete. The list contains the paths in a top-down order, as defined by the order of processEntry. When the files are deleted, the list is iterated in reverse, ensuring that all files of a directory are deleted before the directory itself. Bug: 354099 Change-Id: I6b2ce96b3932ca84ecdfbeab457ce823c95433fb Signed-off-by: Robin Stocker <robin@nibor.org>		2012-06-23 16:32:34 +02:00
..
.settings	Enforce the use of Java5 API:s only (with a few exceptions)	2011-12-16 01:01:36 +01:00
META-INF	Prepare 2.1.0 builds	2012-06-14 00:45:13 +02:00
exttst/org/eclipse/jgit/patch	Kill GitIndex	2011-11-09 09:16:50 +01:00
tst/org/eclipse/jgit	Fix order of deletion for files/dirs in ResolveMerger	2012-06-23 16:32:34 +02:00
tst-rsrc	Ignore trailing comments in transport SPI parsing	2012-03-21 14:07:55 -07:00
.classpath	Partial revert "Switch build to Apache Felix maven-bundle-plugin"	2010-01-10 15:59:03 +01:00
.gitignore	Finish removing Apache Felix maven-bundle-plugin	2010-01-12 11:46:55 -08:00
.project	Enforce the use of Java5 API:s only (with a few exceptions)	2011-12-16 01:01:36 +01:00
build.properties	Partial revert "Switch build to Apache Felix maven-bundle-plugin"	2010-01-10 15:59:03 +01:00
org.eclipse.jgit.core--All-External-Tests (Java 6).launch	Use JUnit4 for tests	2010-08-26 12:26:38 -05:00
org.eclipse.jgit.core--All-External-Tests.launch	Use JUnit4 for tests	2010-08-26 12:26:38 -05:00
org.eclipse.jgit.core--All-Tests (Java 6).launch	Increase heap size for jgit tests	2010-08-27 00:29:31 +02:00
org.eclipse.jgit.core--All-Tests.launch	Use JUnit4 for tests	2010-08-26 12:26:38 -05:00
plugin.properties	Remove incubation marker	2011-05-31 22:53:53 +02:00
pom.xml	Prepare 2.1.0 builds	2012-06-14 00:45:13 +02:00