changeset 750:c33aefd02111

Don't return error result if revision already merged into destination branch
author Dmitry Neverov <dmitry.neverov@jetbrains.com>
date Mon, 10 Feb 2014 20:50:45 +0100
parents 63babe8e01a1
children 3dc67825ce0d
files mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialMergeSupport.java
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialMergeSupport.java	Mon Feb 10 20:26:24 2014 +0100
+++ b/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialMergeSupport.java	Mon Feb 10 20:50:45 2014 +0100
@@ -112,8 +112,10 @@
                 ", conflicts " + conflicts, e);
         return MergeResult.createMergeError(conflicts);
       } catch (MergeWithWorkingDirAncestor e) {
-        LOG.info("Merge failed, root " + root + ", revision " + srcRevision + ", destination " + dstBranch, e);
-        return MergeResult.createMergeError(e.getMessage());
+        LOG.info("Merge is not performed: revision already merged into destination, root " + root +
+                ", revision " + srcRevision +
+                ", destination " + dstBranch, e);
+        return MergeResult.createMergeNotPerformedResult("Revision " + srcRevision + " is already merged into " + dstBranch);
       }
 
       repo.commit().by(hgRoot.getUserForTag()).message(message).call();