Mercurial > jhg

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
704:7743a9c10bfa 705:b4242b7e7dfe
229 workingDirWriter.processFile(df, fileRevIndex, flags); 229 workingDirWriter.processFile(df, fileRevIndex, flags);
230 lastWrittenFileSize = workingDirWriter.bytesWritten(); 230 lastWrittenFileSize = workingDirWriter.bytesWritten();
231 lastFileMode = workingDirWriter.fmode(); 231 lastFileMode = workingDirWriter.fmode();
232 lastFileModificationTime = workingDirWriter.mtime(); 232 lastFileModificationTime = workingDirWriter.mtime();
233 return true; 233 return true;
234 } catch (IOException ex) { 234 } catch (HgIOException ex) {
235 failure = new HgIOException("Failed to write down file revision", ex, workingDirWriter.getDestinationFile()); 235 failure = ex;
236 } catch (HgRuntimeException ex) { 236 } catch (HgRuntimeException ex) {
237 failure = new HgLibraryFailureException(ex); 237 failure = new HgLibraryFailureException(ex);
238 } 238 }
239 return false; 239 return false;
240 } 240 }