Mercurial > jhg
diff cmdline/org/tmatesoft/hg/console/ChangesetDumpHandler.java @ 231:1792b37650f2
Introduced access to conflict resolution information (merge state)
author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
---|---|
date | Wed, 01 Jun 2011 05:44:25 +0200 |
parents | 644ee58c9f16 |
children | 9fb50c04f03c |
line wrap: on
line diff
--- a/cmdline/org/tmatesoft/hg/console/ChangesetDumpHandler.java Tue May 31 05:33:16 2011 +0200 +++ b/cmdline/org/tmatesoft/hg/console/ChangesetDumpHandler.java Wed Jun 01 05:44:25 2011 +0200 @@ -22,8 +22,8 @@ import org.tmatesoft.hg.core.HgChangeset; import org.tmatesoft.hg.core.HgChangesetHandler; +import org.tmatesoft.hg.core.HgFileRevision; import org.tmatesoft.hg.core.Nodeid; -import org.tmatesoft.hg.core.HgLogCommand.FileRevision; import org.tmatesoft.hg.repo.HgRepository; import org.tmatesoft.hg.util.Path; @@ -122,7 +122,7 @@ if (complete) { if (!cset.getModifiedFiles().isEmpty()) { sb.append("files: "); - for (FileRevision s : cset.getModifiedFiles()) { + for (HgFileRevision s : cset.getModifiedFiles()) { sb.append(' '); sb.append(s.getPath()); } @@ -130,7 +130,7 @@ } if (!cset.getAddedFiles().isEmpty()) { sb.append("files+: "); - for (FileRevision s : cset.getAddedFiles()) { + for (HgFileRevision s : cset.getAddedFiles()) { sb.append(' '); sb.append(s.getPath()); }