opendev/gerrit
Code Issues Proposed changes

Merge "Fix: Wrong ps/rev in change-merged stream-event"

Browse Source
This commit is contained in:
Shawn Pearce
2012-05-29 18:57:06 -07:00
committed by gerrit code review
parent d329aa5867 1664ef5c9b
commit 3934fe9565
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java
View File

@@ -900,6 +900,7 @@ public class MergeOp {
final ObjectId id = commit(m, mergeCommit);
final CodeReviewCommit newCommit = (CodeReviewCommit) rw.parseCommit(id);
final Change oldChange = n.change;
n.change =
db.changes().atomicUpdate(n.change.getId(),
@@ -929,6 +930,9 @@ public class MergeOp {
}
});
this.submitted.remove(oldChange);
this.submitted.add(n.change);
if (approvalList != null) {
for (PatchSetApproval a : approvalList) {
db.patchSetApprovals().insert(