My favorites | Sign in
Project Home Downloads Wiki Issues Source
New issue   Search
for
  Advanced search   Search tips   Subscriptions
Issue 2287: Cannot approve merge commit when submitted before dependency has been approved
3 people starred this issue and may be notified of changes. Back to list
Status:  New
Owner:  ----


Sign in to add a comment
 
Reported by andreas....@sap.com, Nov 28, 2013
I have a setup where I applied a fix to one branch, then merged the fix across other branches, and pushed the original fix and all the merge commits on each branch to Gerrit (resulting into one change set per branch). 

The original bug fix on the first branch got approved and merged by Gerrit.

Now, I could not have the subsequent merge commits submitted, but Gerrit only indicated a not so helpful message that the change ‘needs rebase or has dependency’ – w/o the usual offer of pushing a ‘rebase’ button, and also w/o any message from Gerrit indicating that an automated rebase was not possible.

The thing that solved the situation was creating a second patch-set to that change (where I simply made some bogus change to the commit message), and it then let me push the merge through.

It seems like Gerrit is not properly evaluating the status of these merge commits, because the status should change once the dependencies got approved and merged into the main repository?

Nov 28, 2013
Project Member #1 david.pu...@sonymobile.com
What version of Gerrit?

Nov 28, 2013
#2 andreas....@sap.com
Sorry about that - 2.7
Sign in to add a comment

Powered by Google Project Hosting