plasma-desktop bad merge fixed

[Bhushan Shah]

Hello,

On 25th following commit was pushed to plasma-desktop repo,

commit 34106f5dbff824b0c9903cef3bbbbb20244e0971
Author: James D. Smith <smithjd15 at gmail.com>
Date:   Fri May 25 19:42:40 2018 -0600

And it was instead of cherry-picking into 5.12/5.13 branch or instead of
pushing in 5.12 branch and then merging into 5.13/master it was pushed
as 5.13 and 5.12

(git push origin HEAD:5.1{2,3}) or similar command..

Which badly broke the history of 5.12 and 5.13 branch, to fix this
following actions were taken,

- Lock repository down for normal developers
- Reset master to 6229570c3da21072fdb887e585a9b68d9bcaf11e
- Reset Plasma/5.13 to ea5199a751871863bcf599f1ce2517c476212223
- Reset Plasma/5.12 to f7516196cfa49904a4b9daf337090c8f2c78ab20
- Blacklist commit 34106f5dbff824b0c9903cef3bbbbb20244e0971
- Restore normal developer access
- Add extra commits on top of Plasma/5.12 , Plasma/5.13 and master
  branch

Unfortunately as a result some commits were lost from 5.12, 5.13 and
master branch, I've compiled list of the such commits for 5.12 and 5.13
and master branch

- https://ptpb.pw/L799 master branch
- https://ptpb.pw/O9RK Plasma/5.13 branch
- for plasma 5.12 it's two commits of James

Please push the missing commits to branches but not the
34106f5dbff824b0c9903cef3bbbbb20244e0971 , please re-do that commit
instead to give it different hash and then merge it upto master branch.

Also due to force-push, you might have to re-clone plasma-desktop.

Thanks!

-- 
Bhushan Shah
http://blog.bshah.in
IRC Nick : bshah on Freenode
GPG key fingerprint : 0AAC 775B B643 7A8D 9AF7 A3AC FE07 8411 7FBC E11D
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: not available
URL: <http://mail.kde.org/pipermail/plasma-devel/attachments/20180528/d861a308/attachment.sig>