# HG changeset patch
# User Martin Bornhold <martin@rhodecode.com>
# Date 2016-10-28 11:07:21
# Node ID 6bc055e1504d22a3f622e0ff6bafee61be6dc205
# Parent  490ebeeb75af4b099079e59cdf96422bf3056ea6

subrepo: Add exception for subrepo merge errors.

diff --git a/rhodecode/lib/vcs/exceptions.py b/rhodecode/lib/vcs/exceptions.py
--- a/rhodecode/lib/vcs/exceptions.py
+++ b/rhodecode/lib/vcs/exceptions.py
@@ -128,6 +128,14 @@ class NodeAlreadyRemovedError(Committing
     pass
 
 
+class SubrepoMergeError(RepositoryError):
+    """
+    This happens if we try to merge a repository which contains subrepos and
+    the subrepos cannot be merged. The subrepos are not merged itself but
+    their references in the root repo are merged.
+    """
+
+
 class ImproperArchiveTypeError(VCSError):
     pass
 
@@ -156,6 +164,7 @@ class UnhandledException(VCSError):
     # TODO: johbo: Define our own exception for this and stop abusing
     # urllib's exception class.
     'url_error': urllib2.URLError,
+    'subrepo_merge_error': SubrepoMergeError,
 }