commit 7a06dcf3c8aaf484d3ffd98ad5d4734f437d53f2
author David Pursehouse <dpursehouse@collab.net> Tue Nov 13 22:00:25 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Nov 13 22:00:25 2018 +0000
tree aeccbee912a0d9ec9914dd60c4c655a88183e8d6
parent fa08ab3558a7f2d0a4dabf42c08184ac3a3f81a7
parent ed97bc122365d269155393a352c7722afe60a14b

Merge "Improve rebase fail message"

java/com/google/gerrit/server/restapi/change/Rebase.java

diff --git a/java/com/google/gerrit/server/restapi/change/Rebase.java b/java/com/google/gerrit/server/restapi/change/Rebase.java
index 2e2f565..eed0896 100644
--- a/java/com/google/gerrit/server/restapi/change/Rebase.java
+++ b/java/com/google/gerrit/server/restapi/change/Rebase.java
@@ -161,7 +161,8 @@
 
     Base base = rebaseUtil.parseBase(rsrc, str);
     if (base == null) {
-      throw new ResourceConflictException("base revision is missing: " + str);
+      throw new ResourceConflictException(
+          "base revision is missing from the destination branch: " + str);
     }
     PatchSet.Id baseId = base.patchSet().getId();
     if (change.getId().equals(baseId.getParentKey())) {