https://bugs.kde.org/show_bug.cgi?id=420933
David Faure <fa...@kde.org> changed:
What |Removed |Added
----------------------------------------------------------------------------
CC| |jm.ouwerk...@gmail.com
--- Comment #3 from David Faure <fa...@kde.org> ---
This issue has gotten much worse. Since commit ccd8d4cff3547bb62de87,
kdesrc-build just stashes away all my changes, unconditionally.
This has made me lose changes all over the place. I maintain 80 frameworks and
occasionally hack on others, like akonadi. If I add some debug output in
akonadi for a rare bug, hoping it will happen again one day, I don't want
kdesrc-build to just stash that away on the next update.
The commit says "Leave it up to the user to recover the stashed changes",
that's not reasonable for a use case like the above. I'm supposed to keep a
list of the repos in which I have local changes, and once kdesrc-build is
finished, go into those, stash pop and rebuild? Talk about an automated
tool....
I don't understand why kdesrc-build is having so much trouble doing the "stash,
pull rebase, stash pop" dance. My simple http://www.davidfaure.fr/2020/gitup
hasn't failed in years. If there's a conflict, there's a conflict, but
otherwise it does not lead to "Unable to re-apply stashed changes" with no
stashed changed.
There's also git's newer autostash feature, but I haven't tried that. If it
works OK, I'd be fine with kdesrc-build depending on that feature (and doing
the current just-stash if git is older).
--
You are receiving this mail because:
You are watching all bug changes.
