Mercurial > jhg
diff src/org/tmatesoft/hg/core/HgRevertCommand.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 | 65c01508f002 |
children |
line wrap: on
line diff
--- a/src/org/tmatesoft/hg/core/HgRevertCommand.java Wed Aug 14 20:07:26 2013 +0200 +++ b/src/org/tmatesoft/hg/core/HgRevertCommand.java Thu Aug 15 18:43:50 2013 +0200 @@ -21,7 +21,6 @@ import java.util.LinkedHashSet; import java.util.Set; -import org.tmatesoft.hg.internal.COWTransaction; import org.tmatesoft.hg.internal.CsetParamKeeper; import org.tmatesoft.hg.internal.DirstateBuilder; import org.tmatesoft.hg.internal.DirstateReader; @@ -160,7 +159,7 @@ progress.worked(1); cancellation.checkCancelled(); } - Transaction.Factory trFactory = new COWTransaction.Factory(); + Transaction.Factory trFactory = implRepo.getTransactionFactory(); Transaction tr = trFactory.create(repo); try { // TODO same code in HgAddRemoveCommand and similar in HgCommitCommand