log src/org/tmatesoft/hg/repo/HgMergeState.java @ 670:52af7f62e731

age author description
2013-05-22 Artem Tikhomirov Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions
2012-08-16 Artem Tikhomirov Refactoring: move HgRepository's implementation aspects to Internals (which is now its imlementation counterpart and primary repository class to be used by other parts of the library)
2012-03-29 Artem Tikhomirov FIXMEs: awkward API refactored, what need to be internal got hidden; public aspects got captured in slim interfaces
2012-03-23 Artem Tikhomirov Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level
2012-03-22 Artem Tikhomirov Explicit constant for regular file flags, access to flags for a given file revision
2011-12-16 Artem Tikhomirov Use 'revision index' instead of the vague 'local revision number' concept in the API
2011-11-24 Artem Tikhomirov Expose errors reading mercurial control files with exception
2011-11-17 Artem Tikhomirov Merging state not detected when there's no conflicts to resolve (no merge/state file)
2011-11-11 Artem Tikhomirov Do not fail with HgBadStateException when there are no merge state
2011-09-03 Artem Tikhomirov Use Path instead of plain String for manifest file names
2011-09-03 Artem Tikhomirov HgDirstate shall operate with Path instead of String for file names. Use of Pair instead of array of unspecified length for parents.
2011-08-24 Artem Tikhomirov Avoid IAE:nullid when looking into stale merge/state file
2011-08-12 Artem Tikhomirov Deprecated HgLogCommand.FileRevision gone, top-level HgFileRevision is bright and shiny replacement
2011-08-12 Artem Tikhomirov Issue 8: Means to find out information about given file at specific changeset. Inner ManifestRevisionInspector got promoted to ManifestRevision
2011-06-01 Artem Tikhomirov Introduced access to conflict resolution information (merge state)