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
This commit is contained in:
parent
f8008a7ed1
commit
cc833efbd9
|
@ -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:
|
||||
|
|
Loading…
Reference in a new issue