jgit/org.eclipse.jgit
Kevin Sawicki 108e2bc6e4 Throw formal CheckoutConflictException on hard reset
This will allow calling classes to have access to the
conflicts that occurred during the attempted checkout.

Even though setFailOnConflict(false) is called on the
DirCacheCheckout a CheckoutConflictException can still
be thrown if cleanup fails.

Change-Id: Iea7ad3176a1b0e8606a643de8945e276718eb3ce
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-06-05 15:49:55 +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 next 2.0.0-SNAPSHOT builds 2012-05-31 01:39:57 +02:00
findBugs [findBugs] Silence returning null for StringUtils.toBooleanOrNull() 2011-11-16 20:55:34 +01:00
resources/org/eclipse/jgit Externalize parsing exception message for RebaseCommand#Action 2012-04-02 11:36:29 +02:00
src/org/eclipse/jgit Throw formal CheckoutConflictException on hard reset 2012-06-05 15:49:55 +02:00
.classpath Externalize strings from JGit 2010-05-19 14:37:16 -07:00
.fbprefs Initial JGit contribution to eclipse.org 2009-09-29 16:47:03 -07:00
.gitignore Finish removing Apache Felix maven-bundle-plugin 2010-01-12 11:46:55 -08:00
.project Revert "Hide Maven target directories from Eclipse" 2010-08-28 09:50:50 +02:00
about.html Add missing about.html files to all shipped bundles 2011-06-08 21:51:51 +02:00
build.properties Add "resources/" as a source folder 2010-06-05 14:39:27 +02:00
plugin.properties Remove incubation marker 2011-05-31 22:53:53 +02:00
pom.xml Prepare next 2.0.0-SNAPSHOT builds 2012-05-31 01:39:57 +02:00