Mercurial > hg4j
log src/org/tmatesoft/hg/repo/HgMergeState.java @ 339:863356c2847e
| age | author | description |
|---|---|---|
| Fri, 11 Nov 2011 05:56:09 +0100 | Artem Tikhomirov | Do not fail with HgBadStateException when there are no merge state |
| Sat, 03 Sep 2011 21:46:13 +0200 | Artem Tikhomirov | Use Path instead of plain String for manifest file names |
| Sat, 03 Sep 2011 13:12:13 +0200 | Artem Tikhomirov | HgDirstate shall operate with Path instead of String for file names. Use of Pair instead of array of unspecified length for parents. |
| Wed, 24 Aug 2011 04:10:17 +0200 | Artem Tikhomirov | Avoid IAE:nullid when looking into stale merge/state file |
| Fri, 12 Aug 2011 18:58:16 +0200 | Artem Tikhomirov | Deprecated HgLogCommand.FileRevision gone, top-level HgFileRevision is bright and shiny replacement |
| Fri, 12 Aug 2011 18:48:57 +0200 | Artem Tikhomirov | Issue 8: Means to find out information about given file at specific changeset. Inner ManifestRevisionInspector got promoted to ManifestRevision |
| Wed, 01 Jun 2011 05:44:25 +0200 | Artem Tikhomirov | Introduced access to conflict resolution information (merge state) |