Factory branch cannot fast-forward kernel repo |
||
Issue descriptionWe need to fast-forward kernel 4.4 on reef factory branch (factory-reef-8811.B) to ToT. Bernie has tried to close (abandon) opening CLs on gerrit, but gerrit failed to render few pages: https://chromium-review.googlesource.com/#/c/409677/ https://chromium-review.googlesource.com/#/c/409676/ https://chromium-review.googlesource.com/#/c/409678/ https://chromium-review.googlesource.com/#/c/409679/ I tried to abandon them using gerrit command line, but still gerrit is not happy with current status and does not allow fast-forward.
,
Nov 24 2016
The following revision refers to this bug: https://chromium.googlesource.com/chromiumos/manifest/+/a58aa859aac56a35e57375c3037c8d31a9828ae4 commit a58aa859aac56a35e57375c3037c8d31a9828ae4 Author: Hung-Te Lin <hungte@chromium.org> Date: Thu Nov 24 08:45:03 2016 Temporary moving kernel head to M56. Gerrit is having some problem now and we do need new images immediately. This is a temporary hack so reef factory branch may have 'good' kernel. BUG= chromium:668356 TEST=None Change-Id: Ie44525383691400a3984e24c03d4bca6b7304ad3 Reviewed-on: https://chromium-review.googlesource.com/414784 Trybot-Ready: Hung-Te Lin <hungte@chromium.org> Reviewed-by: Hung-Te Lin <hungte@chromium.org> Commit-Queue: Hung-Te Lin <hungte@chromium.org> Tested-by: Hung-Te Lin <hungte@chromium.org> [modify] https://crrev.com/a58aa859aac56a35e57375c3037c8d31a9828ae4/full.xml
,
Nov 24 2016
I am wondering if the series in the topic 'tpm4fac.reef.8811' somehow got damaged when I abandoned the first one in the series. It seems like a bug for Gerrit to lose the ability to show such changes like this, perhaps this is an unusual corner case. We should be able to delete these objects from the back end database, but I am not clear if that will make it so Gerrit considers all reviews to be gone from the branch. Since they are dead anyway we can give it a shot.
,
Nov 24 2016
That does not seem to have been sufficient, all outstanding changes which have not landed are no longer visible in Gerrit, however Gerrit is still saying there are outstanding changes against the branch. At this point instead of doing the old 'delete branch, make new branch with new hash' routine, we can try to do a force push.
,
Nov 24 2016
Ok it is done, let us hope that whatever ghost is in there of these open CLs against the branch does not come back to haunt us. |
||
►
Sign in to add a comment |
||
Comment 1 by bugdroid1@chromium.org
, Nov 24 2016