##// END OF EJS Templates
vcs: Deprecate generic missing commit merge error reason....
Martin Bornhold -
r1081:6047da4a default
parent child Browse files
Show More
@@ -94,8 +94,9 b' class MergeFailureReason(object):'
94 # The target repository is locked
94 # The target repository is locked
95 TARGET_IS_LOCKED = 7
95 TARGET_IS_LOCKED = 7
96
96
97 # Deprecated, use MISSING_TARGET_REF or MISSING_SOURCE_REF instead.
97 # A involved commit could not be found.
98 # A involved commit could not be found.
98 MISSING_COMMIT = 8
99 _DEPRECATED_MISSING_COMMIT = 8
99
100
100 # The target repo reference is missing.
101 # The target repo reference is missing.
101 MISSING_TARGET_REF = 9
102 MISSING_TARGET_REF = 9
@@ -95,7 +95,7 b' class PullRequestModel(BaseModel):'
95 MergeFailureReason.TARGET_IS_LOCKED: lazy_ugettext(
95 MergeFailureReason.TARGET_IS_LOCKED: lazy_ugettext(
96 'This pull request cannot be merged because the target repository'
96 'This pull request cannot be merged because the target repository'
97 ' is locked.'),
97 ' is locked.'),
98 MergeFailureReason.MISSING_COMMIT: lazy_ugettext(
98 MergeFailureReason._DEPRECATED_MISSING_COMMIT: lazy_ugettext(
99 'This pull request cannot be merged because the target or the '
99 'This pull request cannot be merged because the target or the '
100 'source reference is missing.'),
100 'source reference is missing.'),
101 MergeFailureReason.MISSING_TARGET_REF: lazy_ugettext(
101 MergeFailureReason.MISSING_TARGET_REF: lazy_ugettext(
General Comments 0
You need to be logged in to leave comments. Login now