New issue
Advanced search Search tips
Note: Color blocks (like or ) mean that a user may not be available. Tooltip shows the reason.

Issue 738116 link

Starred by 1 user

Issue metadata

Status: Fixed
Owner:
Closed: Jun 2017
Cc:
Components:
EstimatedDays: ----
NextAction: ----
OS: ----
Pri: 3
Type: Bug



Sign in to add a comment

git drover can't land the change

Project Member Reported by avayvod@chromium.org, Jun 29 2017

Issue description

I tried to merge a change using drover today. It failed to land:

$ git drover --branch 3112 --cherry-pick 5b58af3409b37c9f12ee12c94c947aca1e8598dd
Going to cherry-pick
"""
commit 5b58af3409b37c9f12ee12c94c947aca1e8598dd

...
    
    Cr-Commit-Position: refs/heads/master@{#483170}
"""
to 3112. Continue (y/n)? y
Running presubmit upload checks ...

Presubmit checks passed.
 chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaNotificationManager.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
...
remote: 
remote: New Changes:        
remote:   https://chromium-review.googlesource.com/555932 [Media,Android] Use empty media metadata instead of null for incognito tabs.        
remote: 
To https://chromium.googlesource.com/chromium/src.git
 * [new branch]                1780f667f6c0163451263f580103f3a87c9ab6eb -> refs/for/refs/branch-heads/3112%wip,m=Initial_upload
Adding self-LGTM (Code-Review +1) because of TBRs.

About to land on 3112. Continue (y/n)? y

It seems this repository has a Commit Queue, which can test and land changes for you. Are you sure you wish to bypass it?
Press Enter to bypass CQ, or Ctrl+C to abort
Error: Command 'cl land --bypass-hooks' failed: Command '['git', 'cl', 'land', '--bypass-hooks']' returned non-zero exit status 1

I chose to bypass CQ as I believe it doesn't work for branches. Is it still true?

I went to the change and saw it had a "Work in Progress" header (which prevented me from submitting on master via the command line before). I had to Submit it from the web ui manually.
 

Comment 1 by aga...@chromium.org, Jun 29 2017

Status: Started (was: Untriaged)
Thanks for the catch! Fixed here: https://chromium-review.googlesource.com/556302
Project Member

Comment 2 by bugdroid1@chromium.org, Jun 29 2017

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/tools/depot_tools/+/897bf0b0836110c11866f745c2dc5f506b864d56

commit 897bf0b0836110c11866f745c2dc5f506b864d56
Author: Aaron Gable <agable@chromium.org>
Date: Thu Jun 29 19:08:10 2017

git-drover: send mail and don't use WIP mode

R=avayvod

Bug:  738116 
Change-Id: Idd1ea46dfd876b800868bba9cc981a4093e1c809
Reviewed-on: https://chromium-review.googlesource.com/556302
Reviewed-by: Andrew Bonventre <andybons@chromium.org>
Commit-Queue: Andrew Bonventre <andybons@chromium.org>

[modify] https://crrev.com/897bf0b0836110c11866f745c2dc5f506b864d56/git_drover.py
[modify] https://crrev.com/897bf0b0836110c11866f745c2dc5f506b864d56/tests/git_drover_test.py

Comment 3 by aga...@chromium.org, Jun 29 2017

Status: Fixed (was: Started)
Update your depot_tools and this should work the next time you try.
Thanks for the quick fix!

Sign in to add a comment