opendev/gerrit
Code Issues Proposed changes

Make rebase failed and merge failed messages consistent

Browse Source 
If the user tries to rebase a change in the Web UI, and the rebase fails
due to merge conflict, an error message is displayed.

Similarly, if the user tries to submit a change, and the merge fails, an
error message is displayed and added as a review comment.

Although the root cause of both errors is the same, the wording of the
messages is not the same.

Update the error messages to make them more consistent.

Also update the error message about recursive merge for consistency.

Change-Id: Id30c7df04ae1412a8633ebc42ac33690f1d2e607
This commit is contained in:
David Pursehouse
2013-01-09 23:36:15 +09:00
parent 34fbcc1fa8
commit 52e01191d8
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-server/src/main/java/com/google/gerrit/server/changedetail/RebaseChange.java
View File

@@ -421,7 +421,7 @@ public class RebaseChange {
if (merger.getResultTreeId() == null) {
throw new PathConflictException(
"The rebase failed since conflicts occured during the merge.");
"The change could not be rebased due to a path conflict during merge.");
}
final CommitBuilder cb = new CommitBuilder();

4
gerrit-server/src/main/java/com/google/gerrit/server/git/CommitMergeStatus.java
View File

@@ -28,7 +28,7 @@ enum CommitMergeStatus {
ALREADY_MERGED(""),
/** */
PATH_CONFLICT("Your change could not be merged due to a path conflict.\n"
PATH_CONFLICT("The change could not be merged due to a path conflict.\n"
+ "\n"
+ "Please rebase the change locally and upload the rebased commit for review."),
@@ -45,7 +45,7 @@ enum CommitMergeStatus {
NO_SUBMIT_TYPE(""),
/** */
CRISS_CROSS_MERGE("Your change requires a recursive merge to resolve.\n"
CRISS_CROSS_MERGE("The change requires a recursive merge to resolve.\n"
+ "\n"
+ "Please merge (or rebase) the change locally and upload the resolution for review."),