diff src/org/tmatesoft/hg/core/HgCheckoutCommand.java @ 705:b4242b7e7dfe

Merge command: implement conflict resolution alternatives
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Thu, 15 Aug 2013 18:43:50 +0200
parents f41dd9a3b8af
children
line wrap: on
line diff
--- a/src/org/tmatesoft/hg/core/HgCheckoutCommand.java	Wed Aug 14 20:07:26 2013 +0200
+++ b/src/org/tmatesoft/hg/core/HgCheckoutCommand.java	Thu Aug 15 18:43:50 2013 +0200
@@ -231,8 +231,8 @@
 				lastFileMode = workingDirWriter.fmode();
 				lastFileModificationTime = workingDirWriter.mtime();
 				return true;
-			} catch (IOException ex) {
-				failure = new HgIOException("Failed to write down file revision", ex, workingDirWriter.getDestinationFile());
+			} catch (HgIOException ex) {
+				failure = ex;
 			} catch (HgRuntimeException ex) {
 				failure = new HgLibraryFailureException(ex);
 			}