Show More
@@ -112,6 +112,16 class CapabilityError(RepoError): | |||
|
112 | 112 | class RequirementError(RepoError): |
|
113 | 113 | """Exception raised if .hg/requires has an unknown entry.""" |
|
114 | 114 | |
|
115 | class UnsupportedMergeRecords(Abort): | |
|
116 | def __init__(self, recordtypes): | |
|
117 | from .i18n import _ | |
|
118 | self.recordtypes = sorted(recordtypes) | |
|
119 | s = ' '.join(self.recordtypes) | |
|
120 | Abort.__init__( | |
|
121 | self, _('unsupported merge state records: %s') % s, | |
|
122 | hint=_('see https://mercurial-scm.org/wiki/MergeStateRecords for ' | |
|
123 | 'more information')) | |
|
124 | ||
|
115 | 125 | class LockError(IOError): |
|
116 | 126 | def __init__(self, errno, strerror, filename, desc): |
|
117 | 127 | IOError.__init__(self, errno, strerror, filename) |
General Comments 0
You need to be logged in to leave comments.
Login now