From kdevelop-devel  Fri Dec 03 14:33:34 2010
From: Aleix Pol <aleixpol () kde ! org>
Date: Fri, 03 Dec 2010 14:33:34 +0000
To: kdevelop-devel
Subject: Re: URGENT: KDevplatform 1.1 branch messed up!
Message-Id: <AANLkTikbKkKJ8nTgSGgsXAsjnJVwXOYqMMwC+AwGgWEP () mail ! gmail ! com>
X-MARC-Message: https://marc.info/?l=kdevelop-devel&m=129138690506368
MIME-Version: 1
Content-Type: multipart/mixed; boundary="--===============2047099191=="

--===============2047099191==
Content-Type: multipart/alternative; boundary=0016364d2b89592f4f0496826caf

--0016364d2b89592f4f0496826caf
Content-Type: text/plain; charset=UTF-8

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.

Aleix

--0016364d2b89592f4f0496826caf
Content-Type: text/html; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

<div class=3D"gmail_quote">On Fri, Dec 3, 2010 at 2:41 PM, Andreas Pakulat =
<span dir=3D"ltr">&lt;<a href=3D"mailto:apaku@gmx.de">apaku@gmx.de</a>&gt;<=
/span> wrote:<br><blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8=
ex;border-left:1px #ccc solid;padding-left:1ex;">
<div class=3D"im">On 03.12.10 14:01:53, Andreas Pakulat wrote:<br>
&gt; On 03.12.10 12:55:44, Milian Wolff wrote:<br>
&gt; &gt; Hey all,<br>
&gt; &gt;<br>
&gt; &gt; the kdevplatform 1.1 branch is totally messed up, it contains lot=
s of commits<br>
&gt; &gt; from master?! I don&#39;t know why, can someone investigate and c=
lean this up?<br>
&gt;<br>
&gt; I can fix that, but everyone will have to rebase any branches created =
from<br>
&gt; master since f397e9504eff43f85a1e0f15d3272583e6569526 and I won&#39;t =
have time<br>
&gt; probably before 11pm or so...<br>
&gt;<br>
&gt; Though basically its easy:<br>
&gt;<br>
&gt; git checkout 1.1<br>
&gt; git reset --hard f397e9504eff43f85a1e0f15d3272583e6569526<br>
<br>
</div>Sorry, that is wrong, it should be<br>
c771e056e595757b3eed8677235747cf257fd14c, thats the last one on my anongit<=
br>
remote in 1.1.<br>
<br>
Andreas<br>
<font color=3D"#888888"><br>
--<br>
You will be imprisoned for contributing your time and skill to a bank robbe=
ry.<br>
</font><div><div></div><div class=3D"h5"><br>
--<br>
KDevelop-devel mailing list<br>
<a href=3D"mailto:KDevelop-devel@kdevelop.org">KDevelop-devel@kdevelop.org<=
/a><br>
<a href=3D"https://barney.cs.uni-potsdam.de/mailman/listinfo/kdevelop-devel=
" target=3D"_blank">https://barney.cs.uni-potsdam.de/mailman/listinfo/kdeve=
lop-devel</a><br>
</div></div></blockquote></div><br><div>Hi,</div><div>I&#39;ve reset the re=
pository to the latest good version (thanks to andreas and ponto who guided=
 me).</div><div><br></div><div>Now there&#39;s some work left to do, we sho=
uld cherry-pick all commits that still apply from master to 1.1.</div>
<div><br></div><div>Aleix</div>

--0016364d2b89592f4f0496826caf--


--===============2047099191==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

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

--===============2047099191==--