Mercurial > jhg

comparison 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
comparison
equal deleted inserted replaced
704:7743a9c10bfa 705:b4242b7e7dfe
210 } 210 }
211 } 211 }
212 } 212 }
213 // bring dirstate up to commit state, TODO share this code with HgAddRemoveCommand 213 // bring dirstate up to commit state, TODO share this code with HgAddRemoveCommand
214 final DirstateBuilder dirstateBuilder = new DirstateBuilder(repo); 214 final DirstateBuilder dirstateBuilder = new DirstateBuilder(repo);
215 dirstateBuilder.fillFrom(new DirstateReader(repo, new Path.SimpleSource())); 215 dirstateBuilder.fillFrom(new DirstateReader(repo, repo.getSessionContext().getPathFactory()));
216 for (Path p : removals) { 216 for (Path p : removals) {
217 dirstateBuilder.recordRemoved(p); 217 dirstateBuilder.recordRemoved(p);
218 } 218 }
219 for (Path p : touchInDirstate) { 219 for (Path p : touchInDirstate) {
220 dirstateBuilder.recordUncertain(p); 220 dirstateBuilder.recordUncertain(p);