Mercurial > jhg

comparison src/org/tmatesoft/hg/internal/WorkingDirFileWriter.java @ 707:42b88709e41d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge: support 'unresolved' resolution with MergeStateBuilder
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Fri, 16 Aug 2013 19:22:59 +0200
parents b4242b7e7dfe
children
comparison
equal deleted inserted replaced
706:cd5c87d96315 707:42b88709e41d
215 public int mtime() { 215 public int mtime() {
216 return (int) (dest.lastModified() / 1000); 216 return (int) (dest.lastModified() / 1000);
217 } 217 }
218 218
219 private void handleUnexpectedCancel(CancelledException ex) { 219 private void handleUnexpectedCancel(CancelledException ex) {
220 hgRepo.getSessionContext().getLog().dump(WorkingDirFileWriter.class, Severity.Error, ex, "Our impl doesn't throw cancellation"); 220 hgRepo.getLog().dump(WorkingDirFileWriter.class, Severity.Error, ex, "Our impl doesn't throw cancellation");
221 } 221 }
222 } 222 }