URGENT: KDevplatform 1.1 branch messed up!

[Andreas Pakulat]

On 03.12.10 22:49:39, Milian Wolff wrote:
> On Friday 03 December 2010 15:33:34 Aleix Pol wrote:
> > 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.
> 
> What do you mean by that? What commits are lost?

Nothing is really lost, but there were several commits to master that
looked like they should've been done to master as well (for example
doc-fixes). Those should be looked at (basically all master commits
since monday) and eventually cherry-picked to 1.1

> And did someone find out who was responsible for this mess-up?

We think (ponto and myself) that Aleix accidentally merged his local
master to 1.1 and pushed that while trying to do the other way around.
But we're not 100% certain. Its unfortunately not always that easy to
reconstruct what went wrong with git (as it doesn't keep track of such
things, except on the machine they actually happened). An unfortunate
accident, that was luckily fixable easily (with a bit of help from
sysadmins to give apol forced-push rights).

Andreas

-- 
You will stop at nothing to reach your objective, but only because your
brakes are defective.