[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kdevelop-devel
Subject:    Re: URGENT: KDevplatform 1.1 branch messed up!
From:       Milian Wolff <mail () milianw ! de>
Date:       2010-12-03 21:49:39
Message-ID: 201012032249.39702.mail () milianw ! de
[Download RAW message or body]

[Attachment #2 (multipart/signed)]


On Friday 03 December 2010 15:33:34 Aleix Pol wrote:
> On Fri, Dec 3, 2010 at 2:41 PM, Andreas Pakulat <apaku@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@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.

What do you mean by that? What commits are lost? And did someone find out who 
was responsible for this mess-up?

Bye
-- 
Milian Wolff
mail@milianw.de
http://milianw.de

["signature.asc" (application/pgp-signature)]

-- 
KDevelop-devel mailing list
KDevelop-devel@kdevelop.org
https://barney.cs.uni-potsdam.de/mailman/listinfo/kdevelop-devel


[prev in list] [next in list] [prev in thread] [next in thread]