# HG changeset patch
# User Martin Bornhold <martin@rhodecode.com>
# Date 2016-10-28 11:06:55
# Node ID 490ebeeb75af4b099079e59cdf96422bf3056ea6
# Parent  e31abe6080b9c2d08eb0f9617d5613f7914f9abf

subrepo: Add merge failure reason code ad message for subrepo merge conflicts.

diff --git a/rhodecode/lib/vcs/backends/base.py b/rhodecode/lib/vcs/backends/base.py
--- a/rhodecode/lib/vcs/backends/base.py
+++ b/rhodecode/lib/vcs/backends/base.py
@@ -104,6 +104,10 @@ class MergeFailureReason(object):
     # The source repo reference is missing.
     MISSING_SOURCE_REF = 10
 
+    # The merge was not successful, there are conflicts related to sub
+    # repositories.
+    SUBREPO_MERGE_FAILED = 11
+
 
 class UpdateFailureReason(object):
     """
diff --git a/rhodecode/model/pull_request.py b/rhodecode/model/pull_request.py
--- a/rhodecode/model/pull_request.py
+++ b/rhodecode/model/pull_request.py
@@ -105,6 +105,9 @@ class PullRequestModel(BaseModel):
         MergeFailureReason.MISSING_SOURCE_REF: lazy_ugettext(
             'This pull request cannot be merged because the source '
             'reference is missing.'),
+        MergeFailureReason.SUBREPO_MERGE_FAILED: lazy_ugettext(
+            'This pull request cannot be merged because of conflicts related '
+            'to sub repositories.'),
     }
 
     UPDATE_STATUS_MESSAGES = {