Mercurial > jhg
log src/org/tmatesoft/hg/internal/CommitFacility.java @ 708:4ffc17c0b534
| 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 |
| Thu, 15 Aug 2013 18:43:50 +0200 | Artem Tikhomirov | Merge command: implement conflict resolution alternatives |
| Thu, 11 Jul 2013 17:54:08 +0200 | Artem Tikhomirov | Refactoring: move all encoding/decoding operations into single place, EncodingHelper |
| Wed, 10 Jul 2013 19:33:51 +0200 | Artem Tikhomirov | Utilize transaction when writing fncache. Better HgIOException |
| Tue, 09 Jul 2013 21:46:45 +0200 | Artem Tikhomirov | Pull: phase1 get remote changes and add local revisions |
| Wed, 03 Jul 2013 15:11:40 +0200 | Artem Tikhomirov | 1) Console push tool. 2) Pass class to blame into FileUtils |
| Tue, 02 Jul 2013 23:21:16 +0200 | Artem Tikhomirov | Push: tests. Commit respects phases.new-commit setting. Fix outgoing when changes are not children of common (Issue 47) |