kdelibs git mess

[Stephen Kelly]

Christoph Feck wrote:

> Hi,
> 
> my git foo is limited, but if I interpret http://ompldr.org/vZzZxaw
> correctly, then somehow master got merged into KDE/4.9 branch,
> meaning, for example, that Alex's commits to depend on cmake 2.8.8 are
> now in KDE/4.9 branch.
> 
> I suggest to not to commit to kdelibs, until this is resolved.

There is indeed breakage there. One way it could have happened is if Marco 
made a commit on his KDE/4.9 branch, and then accidentally did a 'git rebase 
origin/master' or similar and pushed the result. As far as I can see, this 
could happen for any branch at any time. 

There may be a way to add a server-side hook for it, which I've emailed 
sysadmin about. 

The fix should be for dfaure to reset the 4.9 branch to the v4.9.3 tag, 
cherry-pick the commits made after that and force push the result. He's 
going to do that now I think. 

Thanks,

Steve.