# HG changeset patch # User Mads Kiilerich # Date 2013-12-10 19:30:37 # Node ID d80689aa938d3a02a3a78e020a32614db3d2be13 # Parent 1721c30d9cbead15ecf6bef714b53d3aa680491e pull requests: peer-selected branches must use the branch head revision, not the old peer revision diff --git a/kallithea/controllers/pullrequests.py b/kallithea/controllers/pullrequests.py --- a/kallithea/controllers/pullrequests.py +++ b/kallithea/controllers/pullrequests.py @@ -96,7 +96,7 @@ class PullrequestsController(BaseRepoCon "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))