log src/org/tmatesoft/hg/repo/HgMergeState.java @ 712:a864fb309e4b

age author description
Tue, 20 Aug 2013 18:41:34 +0200 Artem Tikhomirov Merge: tests for resolver and complex scenario. Enable commit for merged revisions. Reuse file revisions if nothing changed
Fri, 16 Aug 2013 19:22:59 +0200 Artem Tikhomirov Merge: support 'unresolved' resolution with MergeStateBuilder
Thu, 15 Aug 2013 18:43:50 +0200 Artem Tikhomirov Merge command: implement conflict resolution alternatives
Wed, 22 May 2013 15:52:31 +0200 Artem Tikhomirov Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions
Thu, 16 Aug 2012 17:08:34 +0200 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)
Thu, 29 Mar 2012 20:54:04 +0200 Artem Tikhomirov FIXMEs: awkward API refactored, what need to be internal got hidden; public aspects got captured in slim interfaces
Fri, 23 Mar 2012 22:51:18 +0100 Artem Tikhomirov Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level
Thu, 22 Mar 2012 18:54:11 +0100 Artem Tikhomirov Explicit constant for regular file flags, access to flags for a given file revision
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