From cc833efbd9f45eca46bdb559a5fdeaa3bf4bd49e Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz <henrik@levkowetz.com>
Date: Sat, 14 Nov 2015 08:11:33 +0000
Subject: [PATCH] Added handling for an exception which can occur in
 bin/mergeready if a branch with merge flags is moved, for example moving it
 to an attic after merge.  - Legacy-Id: 10473

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

diff --git a/bin/mergeready b/bin/mergeready
index 0b3bdd77a..7170a6cdc 100755
--- a/bin/mergeready
+++ b/bin/mergeready
@@ -262,7 +262,10 @@ for entry in ready:
     cmd = 'svn log -v -r %s %s/%s/' % (rev, repo, branch)
     if opt_verbose > 1:
         note("Running '%s' ..." % cmd)
-    loginfo = pipe(cmd).splitlines()
+    try:
+        loginfo = pipe(cmd).splitlines()
+    except OSError:
+        continue
     try:
         rev, who, when = split_loginfo(loginfo[1])
     except IndexError: