kdevplatform/kdevelop master branches broken!! [Re: unittests branch merged]

[Miha Čančula]

2012/10/27 Milian Wolff <mail at milianw.de>

> On Saturday 27 October 2012 00:59:32 Aleix Pol wrote:
> > Hi!
> > Good news from Vienna again, we decided to merge the unit test support
> > from Miha's branch to master, so that we can polish it for the next
> > KDevelop version. Let's make it rock! :)
>
> Bad news: this merge completely reverted the work of the last weeks in
> kdevplatform and also some essential commits in kdevelop - please stay
> tuned
> until we sort this mess out :(
>
> @Miha and the rest: If you merge master into your feature branch and get
> strange unrelated conflicts... don't just blindly do stuff but actually
> figure
> out whats going on there... sigh
>
Ouch, I'm terribly sorry about this. The conflicts I got were neither
strange nor unrelated, and there was nothing about the files mentioned in
Aleix's merge (only some CMakeLists and the patchreview plugin). I realize
I should have checked all the files that were changed.

Glad to hear that you cleaned it up, I really hope it wasn't too much work.

> --
> Milian Wolff
> mail at milianw.de
> http://milianw.de
> --
> KDevelop-devel mailing list
> KDevelop-devel at kdevelop.org
> https://barney.cs.uni-potsdam.de/mailman/listinfo/kdevelop-devel
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kdevelop-devel/attachments/20121027/cf5ac644/attachment.html>