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

Issue 643405 link

Starred by 1 user

Issue metadata

Status: Fixed
Owner:
Closed: Jan 2017
Cc:
Components:
EstimatedDays: ----
NextAction: ----
OS: Windows
Pri: 2
Type: Bug



Sign in to add a comment

Uploading + editing description conflicts in Gerrit

Project Member Reported by scottmg@chromium.org, Sep 1 2016

Issue description

If `git cl desc` a few times and then try to upload, I get this error:

...
Using 50% similarity for rename/copy detection. Override with --similarity.
Running presubmit upload checks ...

Presubmit checks passed.
The last upload made from this repository was patchset #3 but the most recent
patchset on the server is #6.
Uploading will still work, but if you've uploaded to this issue from another
machine or branch the patch you're uploading now might not include those
changes.
About to upload; enter to confirm.
...


Because desc editing is a CL, this is a bogus check.

I would be more than happy to just not have this check, as I don't find it super-useful. Or maybe a flag to disable the check I could use?
 
Huh. I ... can't reproduce this now. Maybe I'm crazy.
Labels: Proj-Gerrit-Migration
Status: Available (was: Unconfirmed)
IMO, the message is useful except after "git cl desc" or manual edit of change text using Gerrit UI. This can be easily detected by comparing two tree hashes:
 * in the last patchset uploaded from local checkout.
 * in the last patchset uploaded to Gerrit.
If the hashes are the same, then it was indeed git cl desc, otherwise the message is useful.

Thoughts?

btw, there is "-f, --force", AND I'd rather avoid extra config options if possible, as they are hard to maintain.
Components: Infra>SDK
Labels: -Pri-3 Milestone-Dogfood Pri-2

Comment 5 by aga...@chromium.org, Jan 12 2017

Owner: tandrii@chromium.org
Status: Assigned (was: Available)
tandrii: I thought there was a different bug where we decided to stop tracking the latest patchset for gerrit entirely. Am I misremembering? Can you find that bug and dupe this into it, or mark this fixed if my memory is correct?
Status: Fixed (was: Assigned)
We definitely stopped tracking latest patchset, indeed. But I can't find a bug about it. So, marking as fixed.

Sign in to add a comment