My favorites | Sign in
Project Home Downloads Wiki Issues Source
New issue   Search
for
  Advanced search   Search tips   Subscriptions
Issue 1557: Delayed merge + mechanical rebase = anonymous merge
2 people starred this issue and may be notified of changes. Back to list
Status:  New
Owner:  ----


Sign in to add a comment
 
Reported by innocent...@gmail.com, Sep 12, 2012
Affected Version: 2.4.2

What steps will reproduce the problem?
1. +2 a change that has an unmerged dependency (this will cause the merge to be
delayed)
2. Rebase the change using the rebase button in Gerrit
3. +2 the dependency

What is the expected output? What do you see instead?
Gerrit should show a checkmark next to the last person who reviewed the commit
before it was merged. The email that goes out should say it was merged by the
last reviewer.

There is no indication in Gerrit as to who +2ed the revision, indeed there is
no code review checkmark at all (https://gerrit.wikimedia.org/r/#/c/22304/). In
addition, the email that goes out says that it was merged by Anonymous Coward.

Please provide any additional information below.
This was originally filed in our bugtracker (https://bugzilla.wikimedia.org/40019). I have zero clue where to start digging here, so I'm just refiling it here for someone who does know :)
Sep 12, 2012
#1 icee...@googlemail.com
I can not reproduce this with current master. The rebase button just gives a message the change is already recent. 
Some thaughts: are you using the trivial-rebase-detetcor hook script? Normally a rebased change does not inherit any +2s as far as I know.
Sep 13, 2012
Project Member #2 choro...@wikimedia.org
No, we're not using the hook right now. I haven't tried replicating the situation on master yet (we're on 2.4.2 in our production site).
Sign in to add a comment

Powered by Google Project Hosting