How to fix gclient sync failure due to devtools-frontend local changes?

[Marshall Greenblatt]

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

[Nicholas Bishop]

I ran into a similar problem some months ago. For me the problem turned out to be that our automated builder had a quite old version of git; once I updated to something more recent the problem went away.

--
--
Chromium Developers mailing list: chromi...@chromium.org
View archives, change email options, or unsubscribe:
http://groups.google.com/a/chromium.org/group/chromium-dev
---
You received this message because you are subscribed to the Google Groups "Chromium-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email to chromium-dev...@chromium.org.
To view this discussion on the web visit https://groups.google.com/a/chromium.org/d/msgid/chromium-dev/CAFW9UJ-E-ew3NAh9EoiPxicCaOZ9veYny-0jmVdqAZmrOLnJhw%40mail.gmail.com.

[Marshall Greenblatt]

On Mon, Feb 17, 2020 at 5:59 PM Nicholas Bishop <nbi...@neverware.com> wrote:

I ran into a similar problem some months ago. For me the problem turned out to be that our automated builder had a quite old version of git; once I updated to something more recent the problem went away.

Thanks for the suggestion. I've started using ppa:git-core/ppa to retrieve the newest available git version (currently 2.25.0). I'll report back if the problem reproduces with this newest version.