Gerrit does not always accept Change-Id unless it is in the last paragraph |
||
Issue descriptionGerrit does not accept the following bug description. ... Change-Id: I0e2f8e031d2e65d7bb99113a98d4ecd5c639191b Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Conflicts: include/uapi/linux/input.h BUG=None TEST=Build and boot Signed-off-by: Guenter Roeck <groeck@chromium.org> (cherry picked from commit 3720b69bafe9ccb989b9a8604f3e3f89b3610685) Reason seems to be the "Conflicts" text, which is now auto-generated by fromupstream.py if conflicts were found. We have a number of options to solve the problem. - Drop "Conflicts:" - Move Change-Id after BUG/TEST - Relax gerrit
,
Apr 23 2018
It sounds like fromupstream should format the CL a little differently: Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> (cherry picked from commit 3720b69bafe9ccb989b9a8604f3e3f89b3610685) Conflicts: include/uapi/linux/input.h BUG=None TEST=Build and boot Change-Id: I0e2f8e031d2e65d7bb99113a98d4ecd5c639191b Signed-off-by: Guenter Roeck <groeck@chromium.org>
,
Apr 24 2018
Normally it does add the Change-Id to the last paragraph. Problem is if there is a conflict; in that case the Change-Id is added during conflict resolution, and already there when fromupstream restarted afterwards. Or at least that is what I think is happening.
,
Apr 24 2018
current gerrit behavior is what we want imo
,
Apr 26 2018
The following revision refers to this bug: https://chromium.googlesource.com/chromiumos/platform/dev-util/+/2e4f251792902757757dff51da432bbf76e55565 commit 2e4f251792902757757dff51da432bbf76e55565 Author: Guenter Roeck <groeck@chromium.org> Date: Thu Apr 26 06:00:47 2018 fromupstream.py: Ensure that Change-Id is in the correct location A conflict resolution will typically add a Change-Id. Unfortunately, it is in the wrong location. Remove it. BUG= chromium:835881 TEST=Push commit with conflict resolution into gerrit Change-Id: I1d5125a2073500c6404d575f23c7290bbe3df9bc Signed-off-by: Guenter Roeck <groeck@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/1026130 Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com> Reviewed-by: Douglas Anderson <dianders@chromium.org> [modify] https://crrev.com/2e4f251792902757757dff51da432bbf76e55565/contrib/fromupstream.py
,
Apr 26 2018
|
||
►
Sign in to add a comment |
||
Comment 1 by diand...@chromium.org
, Apr 23 2018