opendev/gerrit
Code Issues Proposed changes

Make merge failure error messages consistent

Browse Source 
Change-Id: I9f33fc629587e7b03863d7b3a1f6ed8051d9e56d
This commit is contained in:
David Pursehouse
2015-01-15 15:50:49 +09:00
parent e4e8315cc6
commit 6d3411fe3f
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,13 +28,13 @@ public enum CommitMergeStatus {
ALREADY_MERGED(""), ALREADY_MERGED(""),
/** */ /** */
PATH_CONFLICT("The change could not be merged due to a path conflict.\n" PATH_CONFLICT("Change could not be merged due to a path conflict.\n"
+ "\n" + "\n"
+ "Please rebase the change locally and upload the rebased commit for review."), + "Please rebase the change locally and upload the rebased commit for review."),
/** */ /** */
REBASE_MERGE_CONFLICT( REBASE_MERGE_CONFLICT(
"The change could not be merged due to a conflict.\n" "Change could not be merged due to a conflict.\n"
+ "\n" + "\n"
+ "Please rebase the change locally and upload the rebased commit for review."), + "Please rebase the change locally and upload the rebased commit for review."),

2
gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java
View File

@@ -452,7 +452,7 @@ public class MergeOp {
for (ChangeData cd : queryProvider.get().submitted(destBranch)) { for (ChangeData cd : queryProvider.get().submitted(destBranch)) {
try { try {
Change c = cd.change(); Change c = cd.change();
setNew(c, message(c, "Your change could not be merged, " setNew(c, message(c, "Change could not be merged, "
+ "because the destination branch does not exist anymore.")); + "because the destination branch does not exist anymore."));
} catch (OrmException e) { } catch (OrmException e) {
log.error("Error setting change new", e); log.error("Error setting change new", e);