https://bugs.kde.org/show_bug.cgi?id=420933
Michael Pyne <mp...@kde.org> changed:
What |Removed |Added
----------------------------------------------------------------------------
Latest Commit| |https://invent.kde.org/sdk/
| |kdesrc-build/commit/c4ad3db
| |b9038f9e0339f898a75fa48ce4f
| |dc9cea
Resolution|--- |FIXED
Status|ASSIGNED |RESOLVED
--- Comment #6 from Michael Pyne <mp...@kde.org> ---
Git commit c4ad3dbb9038f9e0339f898a75fa48ce4fdc9cea by Michael Pyne.
Committed on 11/10/2020 at 22:36.
Pushed by mpyne into branch 'master'.
git: Automatically reapply stashed changes if possible.
In the event that the stash does not apply a "post-build" message is
issued to warn the user. Otherwise there is an in-situ message.
This addresses user feedback I have received on Invent and IRC. In
particular re-fixes #42 and bug 420933, and fixes #49.
All that I do here is to use the existing logic and add "git stash pop"
after the update phase has completed. I've previously tried --autostash
(see !32 and !45) and that had issues of its own. Using this approach
allows us to use rely on git directly without risk of missing a merge
conflict that git sometimes seems to generate with `git pull
--autostash` (see
https://invent.kde.org/sdk/kdesrc-build/-/merge_requests/32#note_46926).
The merge request !61 may still be applicable. I haven't looked long
enough to tell if there's more on it than the --autostash feature which
still causes us problems... it's possible that there's a more reliable
method than what we're doing though we've already taken pains to
simplify this routine because of the recurring stash failures that we've
seen previously.
M +18 -7 modules/ksb/Updater/Git.pm
https://invent.kde.org/sdk/kdesrc-build/commit/c4ad3dbb9038f9e0339f898a75fa48ce4fdc9cea
--
You are receiving this mail because:
You are watching all bug changes.
