diff options
Diffstat (limited to 'gerrit-server/src/main/java/com/google/gerrit/server/git/CommitMergeStatus.java')
-rw-r--r-- | gerrit-server/src/main/java/com/google/gerrit/server/git/CommitMergeStatus.java | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/CommitMergeStatus.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/CommitMergeStatus.java index 87903511fc..6b53121b1a 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/CommitMergeStatus.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/CommitMergeStatus.java @@ -51,7 +51,26 @@ enum CommitMergeStatus { /** */ NOT_FAST_FORWARD("Project policy requires all submissions to be a fast-forward.\n" + "\n" - + "Please rebase the change locally and upload again for review."); + + "Please rebase the change locally and upload again for review."), + + /** */ + INVALID_PROJECT_CONFIGURATION("Change contains an invalid project configuration."), + + /** */ + INVALID_PROJECT_CONFIGURATION_PARENT_PROJECT_NOT_FOUND( + "Change contains an invalid project configuration:\n" + + "Parent project does not exist."), + + /** */ + INVALID_PROJECT_CONFIGURATION_ROOT_PROJECT_CANNOT_HAVE_PARENT( + "Change contains an invalid project configuration:\n" + + "The root project cannot have a parent."), + + /** */ + SETTING_PARENT_PROJECT_ONLY_ALLOWED_BY_ADMIN( + "Change contains a project configuration that changes the parent project.\n" + + "The change must be submitted by a Gerrit administrator."); + private String message; |