Mercurial > kallithea
changeset 4314:d80689aa938d
pull requests: peer-selected branches must use the branch head revision, not the old peer revision
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Tue, 10 Dec 2013 19:30:37 +0100 |
parents | 1721c30d9cbe |
children | 8f5ecadb7ec1 |
files | kallithea/controllers/pullrequests.py |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/controllers/pullrequests.py Tue Dec 10 19:30:37 2013 +0100 +++ b/kallithea/controllers/pullrequests.py Tue Dec 10 19:30:37 2013 +0100 @@ -96,7 +96,7 @@ "sort(parents(branch(id(%s)) and merge()) - branch(id(%s)))", branch_rev, branch_rev): cs = repo.get_changeset(i) - otherbranches[cs.branch] = cs.raw_id + otherbranches[cs.branch] = repo.get_changeset(cs.branch).raw_id for abranch, node in otherbranches.iteritems(): selected = 'branch:%s:%s' % (abranch, node) peers.append((selected, abranch))