Skip to content

Commit f71c775

Browse files
committed
Tweak mergeready so that it doesn't fail to reconstruct branch information when encountering non-existant branches.
- Legacy-Id: 18996
1 parent a16f8c4 commit f71c775

1 file changed

Lines changed: 6 additions & 0 deletions

File tree

bin/mergeready

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -345,6 +345,12 @@ for rev, repo, branch in hold:
345345

346346
unmerged_branch_commits = {}
347347
for branch in branches:
348+
try:
349+
cmd = 'svn ls %s/%s --depth empty' % (repo, branch)
350+
_ = pipe(cmd)
351+
except OSError:
352+
note("Skipping nonexistent branch %s" % branch)
353+
continue
348354
note("Fetching commit information for branch %s" % branch)
349355
commits = []
350356
cmd = 'svn log -v -r 0:HEAD --stop-on-copy %s/%s/' % (repo, branch)

0 commit comments

Comments
 (0)