From 85f397149e87ddf58b7b85dbbe5aa72b29e78d3b Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz <henrik@levkowetz.com>
Date: Mon, 4 May 2020 19:40:51 +0000
Subject: [PATCH] Tweaked bin/mergeready with a hint in an error situation  -
 Legacy-Id: 17730

---
 bin/mergeready | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/bin/mergeready b/bin/mergeready
index 2c3769ef7..1052fc6a3 100755
--- a/bin/mergeready
+++ b/bin/mergeready
@@ -372,7 +372,11 @@ keys.sort()
 unmerged = False
 for key in keys:
     (rev, repo, branch, who, merge_path) = all_commits[key]
-    i = unmerged_branch_commits[branch].index(rev)
+    try:
+        i = unmerged_branch_commits[branch].index(rev)
+    except:
+        say("Unexpected state.  Mismatch between branch name and revision in hold-for-merge or ready-for-merge?")
+        raise
     if not i == 0:
         unmerged = True
         sys.stderr.write("There are unmerged commits ahead of r%s on branch ^/%s:\n" % (rev, branch))