Tweak mergeready so that it doesn't fail to reconstruct branch information when encountering non-existant branches.
- Legacy-Id: 18996
This commit is contained in:
parent
a16f8c44d4
commit
f71c775647
|
@ -345,6 +345,12 @@ for rev, repo, branch in hold:
|
||||||
|
|
||||||
unmerged_branch_commits = {}
|
unmerged_branch_commits = {}
|
||||||
for branch in branches:
|
for branch in branches:
|
||||||
|
try:
|
||||||
|
cmd = 'svn ls %s/%s --depth empty' % (repo, branch)
|
||||||
|
_ = pipe(cmd)
|
||||||
|
except OSError:
|
||||||
|
note("Skipping nonexistent branch %s" % branch)
|
||||||
|
continue
|
||||||
note("Fetching commit information for branch %s" % branch)
|
note("Fetching commit information for branch %s" % branch)
|
||||||
commits = []
|
commits = []
|
||||||
cmd = 'svn log -v -r 0:HEAD --stop-on-copy %s/%s/' % (repo, branch)
|
cmd = 'svn log -v -r 0:HEAD --stop-on-copy %s/%s/' % (repo, branch)
|
||||||
|
|
Loading…
Reference in a new issue