Not fix...
What happened is still strange... look at[1], all that left is commit message. I abandon
this patch for now.
I hope we are through this strange condition...
[1]
From: "Yair Zaslavsky" <yzaslavs(a)redhat.com>
To: "Alon Bar-Lev" <alonbl(a)redhat.com>
Cc: "infra" <infra(a)ovirt.org>
Sent: Monday, May 6, 2013 9:33:43 PM
Subject: Re: gerrit.ovirt.org:ovirt-engine corrupted?
merging
http://gerrit.ovirt.org/#/c/14378/ seemed to fix the issue.
----- Original Message -----
> From: "Alon Bar-Lev" <alonbl(a)redhat.com>
> To: "infra" <infra(a)ovirt.org>
> Cc: "Yair Zaslavsky" <yzaslavs(a)redhat.com>
> Sent: Monday, May 6, 2013 9:19:23 PM
> Subject: gerrit.ovirt.org:ovirt-engine corrupted?
>
> Hi,
>
> Something is strange in ovirt-engine repository.
>
> Look at[1], you may notice that it is mered without verify and +2, and that
> last rebase which produced Patch set 6, committed Patch Set 5 (2nd time).
>
> The look at[2], this change depends on it-self, although it is in review
> state (as in submitted once) it is already merged into repo[3], so rebase
> only make it rebase upon it-self...
>
> Abandon [2] does not help, as every patch that is rebased to HEAD will be
> rebased on top of it... causing it to be submit pending.
>
> I am not sure what is the best solution for this, maybe to use force push
> to
> remove these last two changes? Or change in the database the status of the
> last?
>
> Regards,
> Alon Bar-Lev.
>
> [1]
http://gerrit.ovirt.org/#/c/14376/
> [2]
http://gerrit.ovirt.org/#/c/14378/
> [3]
>
http://gerrit.ovirt.org/gitweb?p=ovirt-engine.git;a=commit;h=23dcb89e4398...
>