New issue
Advanced search Search tips

Issue 596155 link

Starred by 2 users

Issue metadata

Status: Duplicate
Merged: issue 608637
Owner: ----
Closed: Aug 2016
Cc:
Components:
EstimatedDays: ----
NextAction: ----
OS: ----
Pri: 2
Type: Bug



Sign in to add a comment

Trybots: dependent patchset that deletes files fails to apply if deleted files were modified by parent patchset

Project Member Reported by piman@chromium.org, Mar 18 2016

Issue description

If PS2 (in CL2) depends on PS1 (in CL1), and if PS2 deletes a file that PS1 modified, PS2 fails to apply. See e.g. https://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_clobber_rel_ng/builds/145924/steps/bot_update/logs/patch%20error

DEBUG subprocess2( 215): git rm content/child/npapi/webplugin_ime_win.cc;  cwd=/b/build/slave/linux_clobber/build/src
Failed to apply patch for content/child/npapi/webplugin_ime_win.cc:
While running git rm content/child/npapi/webplugin_ime_win.cc;
  error: the following file has changes staged in the index:
      content/child/npapi/webplugin_ime_win.cc
  (use --cached to keep the file, or -f to force removal)


content/child/npapi/webplugin_ime_win.cc was modified by https://codereview.chromium.org/1815593002/#ps40001 and deleted by dependent patchset https://codereview.chromium.org/1813143002/#ps1


To avoid the problem I think either individual patchsets should be committed locally, or -f should be passed to git rm -f.
The latter is simpler, but could potentially miss conflicts (if the file was otherwise modified).
 
Cc: rmis...@chromium.org
Labels: -Infra Infra-DepotTools
This is specific to Rietveld and its depot_tools/apply_issue

Comment 2 by benhenry@google.com, Apr 27 2016

Components: Infra>SDK
Labels: -Infra-DepotTools
Happening to me also: https://codereview.chromium.org/1944603002/#ps80001

Just use -f?

Who should own this?
Components: -Infra>SDK Infra>CQ
This is a rietveld commitqueue issue; putting in their triage queue. rmistry (already on cc) implemented dependent patchsets in the first place.
Status: Available (was: Untriaged)
Mergedinto: 608637
Status: Duplicate (was: Available)

Sign in to add a comment