Issue metadata
Sign in to add a comment
|
Trybots: dependent patchset that deletes files fails to apply if deleted files were modified by parent patchset |
||||||||||||||||||||||||
Issue descriptionIf 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).
,
Apr 27 2016
,
May 3 2016
Happening to me also: https://codereview.chromium.org/1944603002/#ps80001 Just use -f? Who should own this?
,
May 3 2016
This is a rietveld commitqueue issue; putting in their triage queue. rmistry (already on cc) implemented dependent patchsets in the first place.
,
May 6 2016
,
Aug 17 2016
|
|||||||||||||||||||||||||
►
Sign in to add a comment |
|||||||||||||||||||||||||
Comment 1 by tandrii@chromium.org
, Mar 20 2016Labels: -Infra Infra-DepotTools