Mercurial > jhg

comparison src/org/tmatesoft/hg/repo/HgMergeState.java @ 249:4c3b9f679412

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Deprecated HgLogCommand.FileRevision gone, top-level HgFileRevision is bright and shiny replacement
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Fri, 12 Aug 2011 18:58:16 +0200
parents 3fbfce107f94
children c6450b0b1fd5
comparison
equal deleted inserted replaced
248:3fbfce107f94 249:4c3b9f679412
25 import java.util.Collections; 25 import java.util.Collections;
26 import java.util.List; 26 import java.util.List;
27 27
28 import org.tmatesoft.hg.core.HgBadStateException; 28 import org.tmatesoft.hg.core.HgBadStateException;
29 import org.tmatesoft.hg.core.HgFileRevision; 29 import org.tmatesoft.hg.core.HgFileRevision;
30 import org.tmatesoft.hg.core.HgLogCommand.FileRevision;
31 import org.tmatesoft.hg.core.Nodeid; 30 import org.tmatesoft.hg.core.Nodeid;
32 import org.tmatesoft.hg.internal.ManifestRevision; 31 import org.tmatesoft.hg.internal.ManifestRevision;
33 import org.tmatesoft.hg.internal.Pool; 32 import org.tmatesoft.hg.internal.Pool;
34 import org.tmatesoft.hg.util.Path; 33 import org.tmatesoft.hg.util.Path;
35 import org.tmatesoft.hg.util.PathPool; 34 import org.tmatesoft.hg.util.PathPool;