diff options
| author | Kevin Sawicki <kevin@github.com> | 2012-06-05 02:17:30 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2012-06-05 15:49:55 +0200 |
| commit | 108e2bc6e43b1ddf4d7545edffc75dcc9e106cd7 (patch) | |
| tree | 2c6855a461989c86464e8f389692a0ce6dc6eb7d /org.eclipse.jgit.packaging/org.eclipse.jgit.repository/assembly.xml | |
| parent | 036e40ef42b6461f1547b6b8e1b3dd896c26f69b (diff) | |
| download | jgit-108e2bc6e43b1ddf4d7545edffc75dcc9e106cd7.tar.gz jgit-108e2bc6e43b1ddf4d7545edffc75dcc9e106cd7.zip | |
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>
Diffstat (limited to 'org.eclipse.jgit.packaging/org.eclipse.jgit.repository/assembly.xml')
0 files changed, 0 insertions, 0 deletions