I tried creating a cherry-pick on Gerrit, but it didn't auto-cc anyone so I gave up and abandoned it.

Now when I want to use git drover, it tries to reuse that CL (which is abandoned) and fails.


$ git drover --branch 3202 --cherry-pick 4558c28                      
Going to cherry-pick
"""
commit 4558c2885e618557a674660aff57404d25537070
Author: Daniel Cheng <dcheng@chromium.org>
Date:   Fri Sep 8 05:00:29 2017 +0000

    Manually propagate sandbox flags to documents transformed by XSLT

    Normally, this would Just Work but the combination of MHTML and XSLT
    ends up resulting in a weird interaction. MHTML enforces sandbox flags
    on a per-document basis, rather than forcing them on the frame: this
    makes sense, since the sandbox flags enforced by a MHTML document should
    not apply on subsequent pages. However, XSLT installs a new document to
    hold the transformed content. When installing a new Document, the
    effective sandbox flags from the FrameLoader are applied--but MHTML only
    applied them to the Document, so FrameLoader doesn't know about them.
    This fix is to manually propagate the flags for XSLT...

    Bug: 762930
    Change-Id: I29efb0713195febb1ff4e8af7fd27ba1230abab4
    Reviewed-on: https://chromium-review.googlesource.com/656397
    Reviewed-by: Kouhei Ueno <kouhei@chromium.org>
    Commit-Queue: Daniel Cheng <dcheng@chromium.org>
    Cr-Commit-Position: refs/heads/master@{#500510}
"""
to 3202. Continue (y/n)? y
Running presubmit upload checks ...

Presubmit checks passed.
 third_party/WebKit/Source/core/frame/MHTMLTest.cpp         | 24 ++++++++++++++++++++++++
 third_party/WebKit/Source/core/testing/data/mhtml/xslt.mht | 25 +++++++++++++++++++++++++
 third_party/WebKit/Source/core/xml/XSLTProcessor.cpp       |  1 +
 3 files changed, 50 insertions(+)
remote: Processing changes: refs: 1, done
remote: (W) bbe2c21: commit subject >50 characters; use shorter first paragraph
To https://chromium.googlesource.com/chromium/src.git
 ! [remote rejected]           bbe2c21d086cfe1e5683332fb172c118e2c9c453 -> refs/for/refs/branch-heads/3202%ready,notify=ALL,m=Initial_upload (change https://chromium-review.googlesource.com/#/c/chromium/src/+/668804 closed)
error: failed to push some refs to 'https://chromium.googlesource.com/chromium/src.git'