Skip to content

Commit 6335cf5

Browse files
committed
Updated mergeready to work with svn 1.9, which seems to return an error for properties which aren't found.
- Legacy-Id: 10266
1 parent effd727 commit 6335cf5

1 file changed

Lines changed: 9 additions & 2 deletions

File tree

bin/mergeready

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -270,8 +270,15 @@ for entry in ready:
270270
if 'M' in type or 'A' in type or 'D' in type:
271271
break
272272
# Get the test status
273-
cmd = 'svn propget --revprop -r %s "test:unittest"' % rev
274-
unittest = pipe(cmd).strip()
273+
try:
274+
cmd = 'svn propget --revprop -r %s "test:unittest"' % rev
275+
unittest = pipe(cmd).strip()
276+
except OSError as e:
277+
if "E200017" in str(e):
278+
unittestt = ""
279+
pass
280+
else:
281+
raise
275282
#
276283
merge_path = os.path.join(*path.split(os.path.sep)[:4])
277284
if not (rev, repo, merge_path) in hold:

0 commit comments

Comments
 (0)