Mercurial > jhg

comparison cmdline/org/tmatesoft/hg/console/Main.java @ 341:75c452fdd76a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merging state not detected when there's no conflicts to resolve (no merge/state file)
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Thu, 17 Nov 2011 07:04:58 +0100
parents a54bfe0db959
children 58725dd511b3
comparison
equal deleted inserted replaced
340:a54bfe0db959 341:75c452fdd76a
97 // m.testSubrepos(); 97 // m.testSubrepos();
98 // m.testReadWorkingCopy(); 98 // m.testReadWorkingCopy();
99 // m.testParents(); 99 // m.testParents();
100 // m.testEffectiveFileLog(); 100 // m.testEffectiveFileLog();
101 // m.testCatAtCsetRevision(); 101 // m.testCatAtCsetRevision();
102 // m.testMergeState(); 102 m.testMergeState();
103 // m.testFileStatus(); 103 // m.testFileStatus();
104 m.dumpBranches(); 104 // m.dumpBranches();
105 // m.inflaterLengthException(); 105 // m.inflaterLengthException();
106 // m.dumpIgnored(); 106 // m.dumpIgnored();
107 // m.dumpDirstate(); 107 // m.dumpDirstate();
108 // m.testStatusInternals(); 108 // m.testStatusInternals();
109 // m.catCompleteHistory(); 109 // m.catCompleteHistory();