Mercurial > jhg

comparison src/org/tmatesoft/hg/internal/Internals.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 fba85bc1dfb8
children a62079bc422b
comparison
equal deleted inserted replaced
704:7743a9c10bfa 705:b4242b7e7dfe
511 } 511 }
512 512
513 public RevlogStream resolveStoreFile(Path path) { 513 public RevlogStream resolveStoreFile(Path path) {
514 return streamProvider.getStoreFile(path, false); 514 return streamProvider.getStoreFile(path, false);
515 } 515 }
516
517 public Transaction.Factory getTransactionFactory() {
518 return new COWTransaction.Factory();
519 }
516 520
517 // marker method 521 // marker method
518 public static IllegalStateException notImplemented() { 522 public static IllegalStateException notImplemented() {
519 return new IllegalStateException("Not implemented"); 523 return new IllegalStateException("Not implemented");
520 } 524 }