tree 2c6855a461989c86464e8f389692a0ce6dc6eb7d
parent 036e40ef42b6461f1547b6b8e1b3dd896c26f69b
author Kevin Sawicki <kevin@github.com> 1338855450 +0200
committer Matthias Sohn <matthias.sohn@sap.com> 1338904195 +0200

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>