Mercurial > jhg

diff src/org/tmatesoft/hg/core/HgPullCommand.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 7743a9c10bfa
children
line wrap: on
line diff
--- a/src/org/tmatesoft/hg/core/HgPullCommand.java	Wed Aug 14 20:07:26 2013 +0200
+++ b/src/org/tmatesoft/hg/core/HgPullCommand.java	Thu Aug 15 18:43:50 2013 +0200
@@ -21,7 +21,6 @@
 import java.util.List;
 
 import org.tmatesoft.hg.internal.AddRevInspector;
-import org.tmatesoft.hg.internal.COWTransaction;
 import org.tmatesoft.hg.internal.Internals;
 import org.tmatesoft.hg.internal.PhasesHelper;
 import org.tmatesoft.hg.internal.RepositoryComparator;
@@ -78,7 +77,7 @@
 			// add revisions to changelog, manifest, files
 			final Internals implRepo = HgInternals.getImplementationRepo(repo);
 			final AddRevInspector insp;
-			Transaction.Factory trFactory = new COWTransaction.Factory();
+			Transaction.Factory trFactory = implRepo.getTransactionFactory();
 			Transaction tr = trFactory.create(repo);
 			try {
 				incoming.inspectAll(insp = new AddRevInspector(implRepo, tr));