Mercurial > hg > mercurial
changeset 748:54008dd23f2b
TW-34823
author | Dmitry Neverov <dmitry.neverov@jetbrains.com> |
---|---|
date | Mon, 10 Feb 2014 10:57:16 +0100 |
parents | 34f1fe091b84 |
children | 63babe8e01a1 |
files | mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialMergeSupport.java |
diffstat | 1 files changed, 1 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialMergeSupport.java Mon Feb 10 03:07:53 2014 +0100 +++ b/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialMergeSupport.java Mon Feb 10 10:57:16 2014 +0100 @@ -123,6 +123,7 @@ LOG.info("Error while pushing a merge commit, root " + root + ", revision " + srcRevision + ", destination " + dstBranch, e); throw e; } + LOG.info("Merge successfully finished in root " + root + ", revision " + srcRevision + ", destination " + dstBranch); return MergeResult.createMergeSuccessResult(); } catch (Exception e) { if (e instanceof VcsException)