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

Issue 704921 link

Starred by 1 user

Issue metadata

Status: WontFix
Owner:
Closed: Mar 2017
Cc:
Components:
EstimatedDays: ----
NextAction: ----
OS: ----
Pri: 1
Type: Bug



Sign in to add a comment

Patch failure even there is no rebase error on local

Project Member Reported by nedngu...@google.com, Mar 24 2017

Issue description

Patch https://codereview.chromium.org/2773743002/ cannot be landed because it keeps having rebase error. This is strange because we don't have rebase error locally.

Steps to reproduce:
_ git cl patch 2773743002
_ ignore the rebase error
_ run tools/perf/generate_perf_data script
_ commit the change
_ git cl upload
_ Trigger CQ dry run --> this will have rebase error

I am suspecting this is a rietveld issue. 

Set this bug P1 because this may blocking people landing CL.
 
Cc: tandrii@chromium.org
Owner: aga...@chromium.org
Status: Assigned (was: Untriaged)

Comment 2 by aga...@chromium.org, Mar 27 2017

Status: WontFix (was: Assigned)
You explicitly say that, when running "git cl patch", there is a rebase error which you have to ignore.

Why would you expect the CQ to know that the error is safe to ignore? It's doing the right thing.
Sorry, my point is the rebase error only happens when you fetch the changes from codereview through "git cl patch" or when you try to land the CL through CQ. 

If you create the CL locally & run tools/perf/generate_perf_data script to generate the CL, then there is no error when you try to rebase to origin/master locally. However, committing that & uploading the CL will cause the rebase error for CQ again. 

We are able to bypass this by doing "git cl upload --gerrit", so this is no longer blocking us. It's up to you to decide whether this is worth fixing since we are migrating to gerrit anyway.

Sign in to add a comment