Gerrit: git cl upload error message is confusing for dependent CLs |
|||||||
Issue descriptionI have a branch dhcp-format which is based on dhcp-reader which is based on master (infra.git). Branch dchp-reader was uploaded to Gerrit yesterday, and rebased locally (but not on Gerrit) with new commits. Branch dhcp-format has a single commit on top of dhcp-reader, and I'm trying to upload a CL for it. Here's what I get: Presubmit checks passed. go/src/infra/crimson/cmd/cmdhelper/cmdhelper.go | 14 ++++++++++++++ go/src/infra/crimson/cmd/cmdhelper/cmdhelper.infra_testing | 4 ++-- go/src/infra/crimson/cmd/cmdhelper/cmdhelper_test.go | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 91 insertions(+), 2 deletions(-) Upload upstream branch dhcp-reader first. Note: maybe you've uploaded it with --no-squash. If so, then re-upload it with: git cl upload --squash The "upload upstream branch" confused me, since I knew it was uploaded. I'm not sure what "--squash" means (isn't it always squashed anyway?), so I rebased the upstream branch and reuploaded the new patchset. Then 'git cl upload' on the new branch actually went through. I think we should change the message to something like "please rebase and reupload upstream branch...". And, even better, maybe we could have a git cl upload-recursive (or whatever the name) to upload all the upstream branches recursively if needed. The downstream CL that I finally uploaded is https://chromium-review.googlesource.com/c/380302/ Thanks!
,
Sep 5 2016
tl;dr good point.
It's great that you don't know what's "--no-squash" :)
btw, for recursive uploads - there is something already the other way round:
git co grandest-parent-branch
git cl upload --dependencies
* uploading grandest-parent-branch
* uploading less-grandest-parent-branch
...
* uploading parent-branch
* uploading child-branch
But I agree that the other way round is quite useful as well.
,
Sep 5 2016
,
Sep 27 2016
,
Sep 30 2016
,
Jan 6 2017
https://chromium-review.googlesource.com/424968
,
Jan 6 2017
The following revision refers to this bug: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/4874665738590b0a4f4760b497ab28cac20552fb commit 4874665738590b0a4f4760b497ab28cac20552fb Author: Aaron Gable <agable@chromium.org> Date: Fri Jan 06 19:49:21 2017 Make upstream reupload error message clearer BUG= 643466 Change-Id: I6e27334401d541fc4b7b3196465497cab1a78029 Reviewed-on: https://chromium-review.googlesource.com/424968 Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org> Commit-Queue: Aaron Gable <agable@chromium.org> [modify] https://crrev.com/4874665738590b0a4f4760b497ab28cac20552fb/git_cl.py
,
Jan 6 2017
The following revision refers to this bug: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/4874665738590b0a4f4760b497ab28cac20552fb commit 4874665738590b0a4f4760b497ab28cac20552fb Author: Aaron Gable <agable@chromium.org> Date: Fri Jan 06 19:49:21 2017 Make upstream reupload error message clearer BUG= 643466 Change-Id: I6e27334401d541fc4b7b3196465497cab1a78029 Reviewed-on: https://chromium-review.googlesource.com/424968 Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org> Commit-Queue: Aaron Gable <agable@chromium.org> [modify] https://crrev.com/4874665738590b0a4f4760b497ab28cac20552fb/git_cl.py
,
Jan 12 2017
Marking this fixed as the above CL landed. Filed a separate bug for the feature request: https://bugs.chromium.org/p/chromium/issues/detail?id=680702 |
|||||||
►
Sign in to add a comment |
|||||||
Comment 1 by andyb...@chromium.org
, Sep 2 2016Labels: Proj-Gerrit-Migration
Status: Available (was: Untriaged)