We're on Gerrit 2.13.7. We have a project in which some other branch gets merged into master, we push that change in for review, give it a +2 review and +1 verification, and Gerrit will not allow this new merge commit to be submitted without its parents. In "submitted together" a couple of older, abandoned changes are listed. When I look in the git log for master, I see that both of the commits in those two changes are already present in master. However, there are also abandoned reviews for those commits on master in Gerrit. I'm not sure how those changes got into master if their reviews are abandoned. Since both of those two commits are already reachable from master, why is Gerrit preventing this new merge commit from being submitted? What do I need to do to convince Gerrit those two changes are already in master so that this merge can be submitted?
--thanks,--Andrew
--
To unsubscribe, email repo-discuss...@googlegroups.com
More info at http://groups.google.com/group/repo-discuss?hl=en
---
You received this message because you are subscribed to the Google Groups "Repo and Gerrit Discussion" group.
To unsubscribe from this group and stop receiving emails from it, send an email to repo-discuss...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
On Tue, Jun 20, 2017 at 8:32 AM euphxenos <euph...@gmail.com> wrote:We're on Gerrit 2.13.7. We have a project in which some other branch gets merged into master, we push that change in for review, give it a +2 review and +1 verification, and Gerrit will not allow this new merge commit to be submitted without its parents. In "submitted together" a couple of older, abandoned changes are listed. When I look in the git log for master, I see that both of the commits in those two changes are already present in master. However, there are also abandoned reviews for those commits on master in Gerrit. I'm not sure how those changes got into master if their reviews are abandoned. Since both of those two commits are already reachable from master, why is Gerrit preventing this new merge commit from being submitted? What do I need to do to convince Gerrit those two changes are already in master so that this merge can be submitted?You could try to use the consistency checker to fix those changes:
On Monday, June 19, 2017 at 9:09:41 PM UTC-7, David Pursehouse wrote:On Tue, Jun 20, 2017 at 8:32 AM euphxenos <euph...@gmail.com> wrote:We're on Gerrit 2.13.7. We have a project in which some other branch gets merged into master, we push that change in for review, give it a +2 review and +1 verification, and Gerrit will not allow this new merge commit to be submitted without its parents. In "submitted together" a couple of older, abandoned changes are listed. When I look in the git log for master, I see that both of the commits in those two changes are already present in master. However, there are also abandoned reviews for those commits on master in Gerrit. I'm not sure how those changes got into master if their reviews are abandoned. Since both of those two commits are already reachable from master, why is Gerrit preventing this new merge commit from being submitted? What do I need to do to convince Gerrit those two changes are already in master so that this merge can be submitted?You could try to use the consistency checker to fix those changes:Thanks for the suggestion. I tried using the consistency checker on all three changes, but it reported that it didn't find any problems with any of them.I wonder if we'll need to restore and submit those two abandoned changes to get past this
On Tue, Jun 20, 2017 at 2:12 PM euphxenos <euph...@gmail.com> wrote:
On Monday, June 19, 2017 at 9:09:41 PM UTC-7, David Pursehouse wrote:On Tue, Jun 20, 2017 at 8:32 AM euphxenos <euph...@gmail.com> wrote:We're on Gerrit 2.13.7. We have a project in which some other branch gets merged into master, we push that change in for review, give it a +2 review and +1 verification, and Gerrit will not allow this new merge commit to be submitted without its parents. In "submitted together" a couple of older, abandoned changes are listed. When I look in the git log for master, I see that both of the commits in those two changes are already present in master. However, there are also abandoned reviews for those commits on master in Gerrit. I'm not sure how those changes got into master if their reviews are abandoned. Since both of those two commits are already reachable from master, why is Gerrit preventing this new merge commit from being submitted? What do I need to do to convince Gerrit those two changes are already in master so that this merge can be submitted?You could try to use the consistency checker to fix those changes:Thanks for the suggestion. I tried using the consistency checker on all three changes, but it reported that it didn't find any problems with any of them.I wonder if we'll need to restore and submit those two abandoned changes to get past thisAlso try to restore the abandoned change and then run the consistency checked on it.