# HG changeset patch
# User Martin Bornhold <martin@rhodecode.com>
# Date 2016-10-28 10:59:01
# Node ID 2fa39df61008df1a1179bc2972db35027d7481d7
# Parent  e424cba775fe7794a5c712d52d63918ece537cf5

subrepo: Add custom exception to indicate subrepo merge conflict.

diff --git a/vcsserver/exceptions.py b/vcsserver/exceptions.py
--- a/vcsserver/exceptions.py
+++ b/vcsserver/exceptions.py
@@ -56,6 +56,8 @@ UnhandledException = functools.partial(_
 
 URLError = functools.partial(_make_exception, 'url_error')
 
+SubrepoMergeException = functools.partial(_make_exception, 'subrepo_merge_error')
+
 
 class HTTPRepoLocked(HTTPLocked):
     """