log mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialMergeSupport.java @ 1027:10dc26b32c35

age author description
Wed, 05 Aug 2020 13:19:53 +0300 nikolai kulakov Update code according to new Java
Mon, 22 Jan 2018 11:39:20 +0100 pavel.sher Update copyright
Thu, 18 Sep 2014 11:28:51 +0200 Dmitry Neverov Add CommitSupport
Mon, 10 Feb 2014 21:22:31 +0100 Dmitry Neverov Emulate fast-forward merge when dstBranch is reachable from srcRevision
Mon, 10 Feb 2014 20:50:45 +0100 Dmitry Neverov Don't return error result if revision already merged into destination branch
Mon, 10 Feb 2014 20:26:24 +0100 Dmitry Neverov support auto-merge for bookmarks
Mon, 10 Feb 2014 10:57:16 +0100 Dmitry Neverov TW-34823
Mon, 10 Feb 2014 03:07:53 +0100 Dmitry Neverov TW-34823 add logging for merge
Tue, 14 Jan 2014 12:45:10 +0100 Dmitry Neverov Update copyright
Fri, 18 Oct 2013 15:07:44 +0400 Dmitry Neverov Ability to specify an author of the merge commit
Wed, 16 Oct 2013 14:33:41 +0400 Dmitry Neverov Use non-interactive merge
Tue, 15 Oct 2013 22:46:42 +0400 Dmitry Neverov Use factory methods to create merge results
Thu, 26 Sep 2013 16:28:57 +0400 Dmitry Neverov TW-23468 support tags as branches
Tue, 17 Sep 2013 20:13:35 +0400 Dmitry Neverov Report conflicts from subrepos
Tue, 17 Sep 2013 18:48:51 +0400 Dmitry Neverov Merge in subrepos
Mon, 16 Sep 2013 21:51:32 +0400 Dmitry Neverov Don't throw errors for merge into same branch
Mon, 19 Aug 2013 14:21:24 +0400 Dmitry Neverov Implement tryMerge
Wed, 14 Aug 2013 11:07:19 +0400 Dmitry Neverov Return a MergeResult
Wed, 07 Aug 2013 13:08:31 +0400 Dmitry Neverov Implement MergeSupport