[plasma-devel] Re: Notice of significant adjustment to KWin

[Jonathan Riddell]

go ahead and do it thanks

On Mon, Jun 12, 2017 at 01:56:10AM +0200, Roman Gilg wrote:
> I pushed the missing commits and remerged 5.10. There is one commit from 5.9,
> which is missing in 5.10 and master. Is this one meant to go in 5.10 and master
> as well?
> 
> https://cgit.kde.org/kwin.git/commit/?h=Plasma/5.9&id=
> 55f169d1c34491f0d97c8b7a162f4ba60f6849e2
> 
> And I think Jonathan has to change the version number to 5.10.90 again on
> master. Or I can do it.
> 
> 
> 
> On Sun, Jun 11, 2017 at 3:15 AM, Martin Flöser <mgraesslin at kde.org> wrote:
> 
>     Am 2017-06-10 17:59, schrieb Roman Gilg:
> 
>         Can I just push them again until - but excluding - 28e4e9eaad1? This
>         would be:
> 
> 
> 
>     You don't need to repush the scripty commits as scripty will fix up anyway.
>     Also the multiple merges of Plasma/5.10 can be condensed to one new merge.
>     Should be four commits to push if I counted correctly.
> 
>     Cheers
>     Martin
> 
> 
>         4cbd213 SVN_SILENT made messages (.desktop file) - always resolve ours
> 
>         74f1cee SVN_SILENT made messages (.desktop file) - always resolve ours
> 
>         3fd6307 [platforms/drm] Make Atomic Mode Setting the new default
>         5ba13cc SVN_SILENT made messages (.desktop file) - always resolve ours
> 
>         21bd910 [DRM plugin] Remove dead code
>         cf7ef1b Set pid on the ClientConnection backing the PlasmaWindow
>         surface.
>         baf1144 Merge branch 'Plasma/5.10'
>         bddde8d Fix compilation without libinput. #if is used everywhere else,
>         #ifdef is wrong.
>         2281bd1 SVN_SILENT made messages (.desktop file) - always resolve ours
> 
>         1432efb SVN_SILENT made messages (.desktop file) - always resolve ours
> 
>         e591280 Merge branch 'Plasma/5.10'
> 
>         Greetings
>         Roman
> 
>         On Sat, Jun 10, 2017 at 8:41 PM, Martin Flöser <mgraesslin at kde.org>
>         wrote:
> 
>        
>             Am 2017-06-10 11:43, schrieb Roman:
> 
> 
>                 Why have there been so many commits removed? I thought the
>                 offending
>                 one was 28e4e9eaad1, so everything before that couldn't have
>                 stayed
>                 in?
> 
> 
>             I asked for the first one prior to montel's first commit according
>             to git log on cgit.kde.org [1]. Might be that I did a mistake there
>             - only have a tablet currently. Also it did not look like many
>             commits to me.
> 
>             Cheers
>             Martin
> 
>             Greetings
>             Roman
> 
>             On Fri, Jun 9, 2017 at 10:30 PM, Rik Mills <rikmills at kubuntu.org>
>             wrote:
> 
>             Fair enough. I will not poke at that further then.
> 
>             On 09/06/17 21:20, Ben Cooksley wrote:
>             >From my understanding invasive changes were committed without
>             review,
>             which were similar to changes which had been previously been
>             rejected
>             in review.
> 
>             Regards,
>             Ben
> 
>             I look forward to good progress being restored. :)
>        
> 
> 
> 
>         Links:
>         ------
>         [1] http://cgit.kde.org
> 
>