Mercurial > hg4j
log src/org/tmatesoft/hg/core/HgPullCommand.java @ 705:b4242b7e7dfe
age | author | description |
---|---|---|
Thu, 15 Aug 2013 18:43:50 +0200 | Artem Tikhomirov | Merge command: implement conflict resolution alternatives |
Wed, 14 Aug 2013 20:07:26 +0200 | Artem Tikhomirov | Merge command introduced |
Fri, 12 Jul 2013 16:29:06 +0200 | Artem Tikhomirov | Effective update of HgParentChildMap when repository got few revisions added |
Thu, 11 Jul 2013 18:41:40 +0200 | Artem Tikhomirov | Delete bundle with push/pull changes once command completes successfully. Test for bundle generator |
Wed, 10 Jul 2013 19:33:51 +0200 | Artem Tikhomirov | Utilize transaction when writing fncache. Better HgIOException |
Wed, 10 Jul 2013 16:41:49 +0200 | Artem Tikhomirov | Pull: phase2 - update phases from remote, fncache with added files. Tests |
Tue, 09 Jul 2013 21:46:45 +0200 | Artem Tikhomirov | Pull: phase1 get remote changes and add local revisions |