Skip to content

Commit cc833ef

Browse files
committed
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
1 parent f8008a7 commit cc833ef

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

bin/mergeready

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,10 @@ for entry in ready:
262262
cmd = 'svn log -v -r %s %s/%s/' % (rev, repo, branch)
263263
if opt_verbose > 1:
264264
note("Running '%s' ..." % cmd)
265-
loginfo = pipe(cmd).splitlines()
265+
try:
266+
loginfo = pipe(cmd).splitlines()
267+
except OSError:
268+
continue
266269
try:
267270
rev, who, when = split_loginfo(loginfo[1])
268271
except IndexError:

0 commit comments

Comments
 (0)