Re: kde-workspace/4.9 messed up

2012-11-11 Thread Ben Cooksley
Hi all, This has now been corrected - KDE/4.9 has been rewound to f7fb0c10fa6bc04082963fa5863c579d560dc4a1. I have also blacklisted one of the commit hashes so this cannot re-enter the repository. You need to run "git reset --hard origin/KDE/4.9" with the KDE/4.9 branch checked out to reset yours

Re: Review Request: Make sure ksmserver ignores excluded apps when saving session

2012-11-11 Thread Jekyll Wu
--- This is an automatically generated e-mail. To reply, visit: http://git.reviewboard.kde.org/r/107276/ --- (Updated Nov. 10, 2012, 12:45 p.m.) Review request for kdelibs, Plasma and

Review Request: Make sure ksmserver ignores excluded apps when saving session

2012-11-11 Thread Jekyll Wu
--- This is an automatically generated e-mail. To reply, visit: http://git.reviewboard.kde.org/r/107276/ --- Review request for kdelibs, Plasma and Luboš Luňák. Description --- I

Re: kde-workspace/4.9 messed up

2012-11-11 Thread Stephen Kelly
Christoph Feck wrote: > On Sunday 11 November 2012 12:00:05 Pino Toscano wrote: >> Hi, >> >> somehow the master branch of kde-workspace has been merged in the >> KDE/4.9 branch, with obvious consequences. >> Can anyone please fix this mess? >> >> Thanks, > > Uh oh, I think I did "git reset orig

Re: kde-workspace/4.9 messed up

2012-11-11 Thread Thiago Macieira
On domingo, 11 de novembro de 2012 12.48.15, Christoph Feck wrote: > Uh oh, I think I did "git reset origin/HEAD --hard" in the 4.9 branch, > to get rid of an initial commit I made in that branch. So HEAD doesn't > refer to the remote head in the current branch, but always to the head > of maste

Re: kde-workspace/4.9 messed up

2012-11-11 Thread Christoph Feck
On Sunday 11 November 2012 12:00:05 Pino Toscano wrote: > Hi, > > somehow the master branch of kde-workspace has been merged in the > KDE/4.9 branch, with obvious consequences. > Can anyone please fix this mess? > > Thanks, Uh oh, I think I did "git reset origin/HEAD --hard" in the 4.9 branch,

Re: What is the git workflow for kdelibs ?

2012-11-11 Thread Cornelius Schumacher
On Saturday 10 November 2012 Alexander Neundorf wrote: > > community.kde.org feels to me like a completely unorganized heap of random > stuff. That's true to some degree, and it's exactly the reason why we crated community.kde.org, because we don't want to put this unorganized stuff, which is o

Re: Review Request: Make sure ksmserver ignores excluded apps when saving session

2012-11-11 Thread Aaron J. Seigo
--- This is an automatically generated e-mail. To reply, visit: http://git.reviewboard.kde.org/r/107276/#review21816 --- ksmserver/server.cpp

kde-workspace/4.9 messed up

2012-11-11 Thread Pino Toscano
Hi, somehow the master branch of kde-workspace has been merged in the KDE/4.9 branch, with obvious consequences. Can anyone please fix this mess? Thanks, -- Pino Toscano signature.asc Description: This is a digitally signed message part.

Re: Review Request: parenthesis and not null checking

2012-11-11 Thread Jaime Torres Amate
> On Nov. 10, 2012, 10:21 p.m., Rolf Eike Beer wrote: > > A simple way to verify if this is correct is check if you and the compiler > > agree on the code. Run "make -n" in the build tree to get the full compiler > > command line, then insert a "-S" (assuming you are using gcc) and change > >