New issue
Advanced search Search tips

Issue 854739 link

Starred by 1 user
Status: Available
Owner: ----
Cc:
qyears...@chromium.org
estaab@chromium.org
Components:
EstimatedDays: ----
NextAction: ----
OS: ----
Pri: 2
Type: Bug



Sign in to add a comment

Make git cl gracefully handle Gerrit-side patchset edits

Project Member Reported by mar...@chromium.org, Jun 20 2018 
Use case:
- Author run: git cl upload
- Reviewer use the Gerrit Web UI to make an edit, creating a new patchset
- Author has to sync.

The second step can be replaced with "Use Tricium's apply-fix button". Either way the handling is functionally equivalent for git-cl.

Challenges:
- User may have locally rebased against upstream in the meantime
- Detection at upload vs explicit sync command
- Handling dependent CLs (pipelined changes)

Comment 1 by estaab@chromium.org, Jun 20 2018 

Yes, this should be discussed in the apply-fix design doc.

Comment 2 by qyears...@chromium.org, Aug 13

Cc: -diegomtzg@google.com
Components: Infra>Platform>Tricium
Summary: Make git cl gracefully Gerrit-side patchset edits (was: git-cl: make it handle gracefully Gerrit side patchset edits)

Comment 4 by qyearsley@google.com, Aug 15

Summary: Make git cl gracefully handle Gerrit-side patchset edits (was: Make git cl gracefully Gerrit-side patchset edits)

Comment 5 by tandrii@chromium.org, Oct 18 

ftr, "git cl patch" has a mode, where it completely replaces contents of a branch associated with a CL.

However, I think a better approach would be to get a new command:
$ git cl sync

which would get add a new commit on top of current branch with the diff between last uploaded patchset and what's currently in Gerrit.
►

Sign in to add a comment