Skip to content

Commit 1d8fd6c

Browse files
committed
Fixed a bug in the recent bin/mergeready code.
- Legacy-Id: 11870
1 parent e5092bb commit 1d8fd6c

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

bin/mergeready

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ for key in keys:
353353
commit_comment = pipe("svn log -c %s ^/" % commit).splitlines()[3:-1]
354354
for l in commit_comment:
355355
sys.stderr.write(" %s\n" % l)
356-
del unmerged_branch_commits[branch][j]
356+
unmerged_branch_commits[branch] = unmerged_branch_commits[branch][i:]
357357
sys.stderr.write("\n")
358358
del unmerged_branch_commits[branch][0]
359359

0 commit comments

Comments
 (0)