Mercurial > jhg

diff src/org/tmatesoft/hg/internal/CommitFacility.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 4ffc17c0b534
line wrap: on
line diff
--- a/src/org/tmatesoft/hg/internal/CommitFacility.java	Wed Aug 14 20:07:26 2013 +0200
+++ b/src/org/tmatesoft/hg/internal/CommitFacility.java	Thu Aug 15 18:43:50 2013 +0200
@@ -212,7 +212,7 @@
 		}
 		// bring dirstate up to commit state, TODO share this code with HgAddRemoveCommand
 		final DirstateBuilder dirstateBuilder = new DirstateBuilder(repo);
-		dirstateBuilder.fillFrom(new DirstateReader(repo, new Path.SimpleSource()));
+		dirstateBuilder.fillFrom(new DirstateReader(repo, repo.getSessionContext().getPathFactory()));
 		for (Path p : removals) {
 			dirstateBuilder.recordRemoved(p);
 		}