##// END OF EJS Templates
subrepo: Add custom exception to indicate subrepo merge conflict.
Martin Bornhold -
r98:2fa39df6 default
parent child
Show More
@@ -56,6 +56,8 UnhandledException = functools.partial(_
56
56
57 URLError = functools.partial(_make_exception, 'url_error')
57 URLError = functools.partial(_make_exception, 'url_error')
58
58
59 SubrepoMergeException = functools.partial(_make_exception, 'subrepo_merge_error')
60
59
61
60 class HTTPRepoLocked(HTTPLocked):
62 class HTTPRepoLocked(HTTPLocked):
61 """
63 """
General Comments 0
You need to be logged in to leave comments. Login now