opendev/gerrit
Code Issues Proposed changes

Merge "Improve message for unsatisfiable dependencies"

Browse Source
This commit is contained in:
Edwin Kempin
2013-03-01 13:37:16 +00:00
committed by Gerrit Code Review
parent c7fbeae944 1b428f404f
commit cfdb150f0f
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -836,8 +836,10 @@ public class MergeOp {
m.append(missingCommit.patchsetId.get());
m.append(" of ");
m.append(missingCommit.change.getKey().abbreviate());
m.append(", however the current patch set is ");
m.append(missingCommit.change.currentPatchSetId().get());
if (missingCommit.patchsetId.get() != missingCommit.change.currentPatchSetId().get()) {
m.append(", however the current patch set is ");
m.append(missingCommit.change.currentPatchSetId().get());
}
m.append(".\n");
} else {