From 6335cf510c960da2a3b0533d23ba7fd2f5a978b8 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz <henrik@levkowetz.com>
Date: Thu, 22 Oct 2015 19:41:10 +0000
Subject: [PATCH] Updated mergeready to work with svn 1.9, which seems to
 return an error for properties which aren't found.  - Legacy-Id: 10266

---
 bin/mergeready | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/bin/mergeready b/bin/mergeready
index 7bb15386e..610b4f067 100755
--- a/bin/mergeready
+++ b/bin/mergeready
@@ -270,8 +270,15 @@ for entry in ready:
         if 'M' in type or 'A' in type or 'D' in type:
             break
     # Get the test status
-    cmd = 'svn propget --revprop -r %s "test:unittest"' % rev
-    unittest = pipe(cmd).strip()
+    try:
+        cmd = 'svn propget --revprop -r %s "test:unittest"' % rev
+        unittest = pipe(cmd).strip()
+    except OSError as e:
+        if "E200017" in str(e):
+            unittestt = ""
+            pass
+        else:
+            raise
     # 
     merge_path = os.path.join(*path.split(os.path.sep)[:4])
     if not (rev, repo, merge_path) in hold: