Mercurial > jhg
diff cmdline/org/tmatesoft/hg/console/ChangesetDumpHandler.java @ 471:7bcfbc255f48
Merge changes from smartgit3 branch into 1.1 stream
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
|---|---|
| date | Wed, 11 Jul 2012 20:40:47 +0200 |
| parents | 31a89587eb04 d0e5dc3cae6e |
| children | 37d97854c6ad |
line wrap: on
line diff
--- a/cmdline/org/tmatesoft/hg/console/ChangesetDumpHandler.java Wed Jul 11 19:06:30 2012 +0200 +++ b/cmdline/org/tmatesoft/hg/console/ChangesetDumpHandler.java Wed Jul 11 20:40:47 2012 +0200 @@ -106,6 +106,7 @@ sb.append('\n'); } if (complete) { + f.format("phase: %s\n", cset.getPhase().name()); Nodeid p1 = cset.getFirstParentRevision(); Nodeid p2 = cset.getSecondParentRevision(); int p1x = p1.isNull() ? -1 : repo.getChangelog().getRevisionIndex(p1);