Re: kde-workspace git broken ?

2013-11-15 Thread Wolfgang Bauer
Am Mittwoch, 13. November 2013, 18:42:33 schrieb Ben Cooksley: On Tue, Nov 12, 2013 at 2:21 AM, Wolfgang Bauer wba...@tmo.at wrote: Sorry, it was my fault. And there's also commit 925af7a94eacbe7fef101c6e0f6415b1898d3bfe now. Hi Wolfgang, The sha you have just referenced is a blob,

Re: kde-workspace git broken ?

2013-11-12 Thread Wolfgang Bauer
Am Montag, 11. November 2013, 14:13:22 schrieben Sie: On Monday 11 November 2013 13:29:32 Hugo Pereira Da Costa wrote: Hello, I think commits 9f70241d57f3ba1013b9f28650478c8bbb1233e0 137dd285bdf821fd2c8a5c17e30dc9c1a6eca87b 09ea308ab55505efe7aeaebcd4aef6292cd884e6 seriously broke

Re: kde-workspace git broken ?

2013-11-12 Thread Ben Cooksley
On Tue, Nov 12, 2013 at 2:21 AM, Wolfgang Bauer wba...@tmo.at wrote: Am Montag, 11. November 2013, 14:13:22 schrieben Sie: On Monday 11 November 2013 13:29:32 Hugo Pereira Da Costa wrote: Hello, I think commits 9f70241d57f3ba1013b9f28650478c8bbb1233e0

kde-workspace git broken ?

2013-11-11 Thread Hugo Pereira Da Costa
Hello, I think commits 9f70241d57f3ba1013b9f28650478c8bbb1233e0 137dd285bdf821fd2c8a5c17e30dc9c1a6eca87b 09ea308ab55505efe7aeaebcd4aef6292cd884e6 seriously broke kde-workspace At least several changes in oxygen where reverted in the process. (below is a diff of oxygenstyle.h between

Re: kde-workspace git broken ?

2013-11-11 Thread Martin Gräßlin
On Monday 11 November 2013 13:29:32 Hugo Pereira Da Costa wrote: Hello, I think commits 9f70241d57f3ba1013b9f28650478c8bbb1233e0 137dd285bdf821fd2c8a5c17e30dc9c1a6eca87b 09ea308ab55505efe7aeaebcd4aef6292cd884e6 seriously broke kde-workspace yes, it's broken. I already created a sysadmin

Re: kde-workspace git broken ?

2013-11-11 Thread Sven Brauch
On Monday 11 November 2013 14:13:22 Martin Gräßlin wrote: Please remember: do not push a revert of a merge commit. Another tip not everyone might know: you can use git push --dry-run to see which changes would be pushed, without actually pushing them. That helps a lot with avoiding breakage.

Re: kde-workspace git broken ?

2013-11-11 Thread Hugo Pereira Da Costa
On 11/11/2013 02:13 PM, Martin Gräßlin wrote: On Monday 11 November 2013 13:29:32 Hugo Pereira Da Costa wrote: Hello, I think commits 9f70241d57f3ba1013b9f28650478c8bbb1233e0 137dd285bdf821fd2c8a5c17e30dc9c1a6eca87b 09ea308ab55505efe7aeaebcd4aef6292cd884e6 seriously broke kde-workspace yes,

Re: kde-workspace git broken ?

2013-11-11 Thread Ben Cooksley
Hi everyone, I have now force pushed kde-workspace to return it to a valid state. + 09ea308...008ac5e 008ac5efabfb99f04813e5dad29c2d0a92d13fc5 - master (forced update) + 8105121...f1b57a9 f1b57a9ca9193fb94d985b5cc6d739866c5c59d2 - KDE/4.11 (forced update) I have also blacklisted the following