https://bugs.kde.org/show_bug.cgi?id=420933
Bug ID: 420933
Summary: kdesrc-build fails to update modules randomly (git
stash failure)
Product: kdesrc-build
Version: Git
Platform: Other
OS: Linux
Status: REPORTED
Severity: normal
Priority: NOR
Component: general
Assignee: mp...@kde.org
Reporter: mp...@kde.org
Target Milestone: ---
Created attachment 128105
--> https://bugs.kde.org/attachment.cgi?id=128105&action=edit
kdesrc-build logs from my failed kactivitymanagerd run
SUMMARY
dfaure reports that kdesrc-build can consider a module failed to update (even
though it successfully fetches updates from the git server and successfully
rebases the module to the updated 'master' branch). It complains about being
unable to restore stashed local changes. See
https://invent.kde.org/snippets/868. The pertinent error:
user@localhost:~/release-tools$ cd ../src && ./kdesrc-build --src-only
Updating kde-build-metadata (to branch master)
Local changes detected, stashing them away...
Module updated, reapplying your local changes.
*
* Unable to re-apply stashed changes to kde-build-metadata!
*
* These changes were saved using the name "kdesrc-build auto-stash at
2020-05-02-21:48"
* and should still be available using the name stash@{0}, the command run
* to re-apply was git stash pop --index. Resolve this before you run
* kdesrc-build to update this module again.
*
* If you do not desire to keep your local changes, then you can generally
run
* git reset --hard HEAD, or simply delete the source directory for
* kde-build-metadata. Developers be careful, doing either of these options
will remove
* any of your local work.
* Unable to download required metadata for build process
* Will attempt to press onward...
* Exception message: Runtime Error: Failed to re-apply stashed changes for
kde-build-metadata
STEPS TO REPRODUCE
1. Change to desired config directory
2. Run kdesrc-build --src-only
OBSERVED RESULT
Modules randomly fail to update complaining of re-application of stashed
changes. Different modules fail on subsequent builds.
[18:17] <dfaure> thanks
[18:17] <dfaure> it seems like ot happened randomly in various repos
[18:17] <dfaure> it
[18:17] <dfaure> git version 2.26.1, if it matters
[18:33] <dfaure> mpyne happened twice in a row upon "kdesrc-build frameworks",
but on different modules every time
[18:34] <mpyne> thanks
[18:34] <dfaure> mpyne: once kde-build-metadata, once kio and kdesrc-build
itself... pretty random
In my own testing from an old checkout, applying to master as of 2020-05-02, I
had one module fail for this reason, kactivitymanagerd. I believe this may be
related to a commit that removed a file, but I cannot understand what situation
kactivitymanagerd had been in before that would have led kdesrc-build to think
a local change had occurred. I was not able to reproduce random modules having
this failure.
EXPECTED RESULT
The source code modules cleanly update, since there were no local modifications
to worry about.
SOFTWARE/OS VERSIONS
kdesrc-build: v19.12-44-geaf569d
ADDITIONAL INFORMATION
There have been recent changes to git-stash handling to fix other "fake local
change detected" bugs.
--
You are receiving this mail because:
You are watching all bug changes.
