URGENT: KDevplatform 1.1 branch messed up!

[Aleix Pol]

On Fri, Dec 3, 2010 at 2:41 PM, Andreas Pakulat <apaku at gmx.de> wrote:

> On 03.12.10 14:01:53, Andreas Pakulat wrote:
> > On 03.12.10 12:55:44, Milian Wolff wrote:
> > > Hey all,
> > >
> > > the kdevplatform 1.1 branch is totally messed up, it contains lots of
> commits
> > > from master?! I don't know why, can someone investigate and clean this
> up?
> >
> > I can fix that, but everyone will have to rebase any branches created
> from
> > master since f397e9504eff43f85a1e0f15d3272583e6569526 and I won't have
> time
> > probably before 11pm or so...
> >
> > Though basically its easy:
> >
> > git checkout 1.1
> > git reset --hard f397e9504eff43f85a1e0f15d3272583e6569526
>
> Sorry, that is wrong, it should be
> c771e056e595757b3eed8677235747cf257fd14c, thats the last one on my anongit
> remote in 1.1.
>
> Andreas
>
> --
> You will be imprisoned for contributing your time and skill to a bank
> robbery.
>
> --
> KDevelop-devel mailing list
> KDevelop-devel at kdevelop.org
> https://barney.cs.uni-potsdam.de/mailman/listinfo/kdevelop-devel
>

Hi,
I've reset the repository to the latest good version (thanks to andreas and
ponto who guided me).

Now there's some work left to do, we should cherry-pick all commits that
still apply from master to 1.1.

Aleix
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kdevelop-devel/attachments/20101203/6511542b/attachment.html>