Hi,
I have a new checkout of Chromium where I'm trying to sync from current master (b77af57) to refs/tags/80.0.3987.0 on Linux. It looks like the initial `gclient sync` at current master is leaving behind local changes that cannot be fixed by the follow-up `gclient sync --force --reset` at
80.0.3987.0. What is the recommended way to fix this without manual intervention (e.g. when running on an automated builder)?
Thanks,
Marshall
$ gclient sync --nohooks --with_branch_heads --disable-syntax-validation --jobs 16
$ git fetch --tags
$ git checkout --force refs/tags/80.0.3987.0
Previous HEAD position was b77af57... [Extensions Functions] Migrate activityLogPrivate API to ExtensionFunction
HEAD is now at 1df5003... Publish DEPS for 80.0.3987.0
$ gclient sync --force --reset --with_branch_heads --disable-syntax-validation --jobs 16
src/third_party/devtools-frontend/src (ERROR)
----------------------------------------
[0:00:04] Started.
[0:00:04] Finished running: git config remote.origin.url
[0:00:04] Finished running: git rev-list -n 1 HEAD
[0:00:04] Finished running: git rev-parse --abbrev-ref=strict HEAD
[0:00:05] Finished running: git rev-parse 20bddaccdba0bac8ef9329407d5a03f1defb621f
[0:00:06] Finished running: git rev-list -n 1 HEAD
----------------------------------------
Error: Command 'git checkout --quiet 20bddaccdba0bac8ef9329407d5a03f1defb621f' returned non-zero exit status 1 in /tmp/chromium/src/third_party/devtools-frontend/src
error: Your local changes to the following files would be overwritten by checkout:
test/screenshots/image_diff/mac/libbase.dylib
test/screenshots/image_diff/mac/libc++.dylib
test/screenshots/image_diff/mac/libchrome_zlib.dylib
test/screenshots/interactive/no-diff-available.png
Please, commit your changes or stash them before you can switch branches.
Aborting