From f71c775647e43256d3dd77068358ffeb1c7240bb Mon Sep 17 00:00:00 2001
From: Robert Sparks <rjsparks@nostrum.com>
Date: Fri, 14 May 2021 20:50:04 +0000
Subject: [PATCH] Tweak mergeready so that it doesn't fail to reconstruct
 branch information when encountering non-existant branches.  - Legacy-Id:
 18996

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

diff --git a/bin/mergeready b/bin/mergeready
index 1052fc6a3..f4047725e 100755
--- a/bin/mergeready
+++ b/bin/mergeready
@@ -345,6 +345,12 @@ for rev, repo, branch in hold:
 
 unmerged_branch_commits = {}
 for branch in branches:
+    try:
+        cmd = 'svn ls %s/%s --depth empty' % (repo, branch)
+        _ = pipe(cmd)
+    except OSError:
+        note("Skipping nonexistent branch %s" % branch)
+        continue
     note("Fetching commit information for branch %s" % branch)
     commits = []
     cmd = 'svn log -v -r 0:HEAD --stop-on-copy %s/%s/' % (repo, branch)