Re: nepomuk-core KDE/4.10 branch mismerged

2013-05-03 Thread Torgny Nyblom
On Friday 03 May 2013 20.26.58 Ben Cooksley wrote: Hi all, Just a quick notice that due to a bad merge made into the KDE/4.10 branch of nepomuk-core i've temporarily suspended the ability to push into this repository. This also means that we cannot release anything from KDE/4.10 for now

Re: nepomuk-core KDE/4.10 branch mismerged

2013-05-03 Thread Vishesh Handa
On Fri, May 3, 2013 at 8:26 PM, Torgny Nyblom nyb...@kde.org wrote: On Friday 03 May 2013 20.26.58 Ben Cooksley wrote: Hi all, Just a quick notice that due to a bad merge made into the KDE/4.10 branch of nepomuk-core i've temporarily suspended the ability to push into this repository.

Re: nepomuk-core KDE/4.10 branch mismerged

2013-05-03 Thread Torgny Nyblom
On Friday 03 May 2013 20.51.58 Vishesh Handa wrote: On Fri, May 3, 2013 at 8:26 PM, Torgny Nyblom nyb...@kde.org wrote: On Friday 03 May 2013 20.26.58 Ben Cooksley wrote: Hi all, Just a quick notice that due to a bad merge made into the KDE/4.10 branch of nepomuk-core i've

Re: nepomuk-core KDE/4.10 branch mismerged

2013-05-03 Thread Vishesh Handa
On Fri, May 3, 2013 at 9:27 PM, Torgny Nyblom nyb...@kde.org wrote: On Friday 03 May 2013 20.51.58 Vishesh Handa wrote: On Fri, May 3, 2013 at 8:26 PM, Torgny Nyblom nyb...@kde.org wrote: On Friday 03 May 2013 20.26.58 Ben Cooksley wrote: Hi all, Just a quick notice that due to

Re: nepomuk-core KDE/4.10 branch mismerged

2013-05-03 Thread Simeon Bird
If it helps, the last good commit I have in my local clone is aafe2cbc4945d02182dd4055e3e38742a31fecf8, but there might have been some since then. Simeon On 3 May 2013 12:38, Vishesh Handa m...@vhanda.in wrote: On Fri, May 3, 2013 at 9:27 PM, Torgny Nyblom nyb...@kde.org wrote: On Friday