Mercurial > jhg
log src/org/tmatesoft/hg/repo/HgMergeState.java @ 398:c76c57f6b961
| age | author | description |
|---|---|---|
| Fri, 16 Dec 2011 15:37:27 +0100 | Artem Tikhomirov | Use 'revision index' instead of the vague 'local revision number' concept in the API |
| Thu, 24 Nov 2011 02:57:03 +0100 | Artem Tikhomirov | Expose errors reading mercurial control files with exception |
| Thu, 17 Nov 2011 07:04:58 +0100 | Artem Tikhomirov | Merging state not detected when there's no conflicts to resolve (no merge/state file) |
| 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 |