<div class="gmail_quote">On Sun, May 8, 2011 at 5:16 AM, Nicolas Alvarez <span dir="ltr"><<a href="mailto:nicolas.alvarez@gmail.com">nicolas.alvarez@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
Hi guys,<br>
<br>
I have discovered that a few kdeedu git repositories were mis-converted.<br>
There are SVN commits that were skipped during conversion to git, so they<br>
are not present in the git repository. They will have to be reconverted from<br>
SVN and pushed again.<br>
<br>
The affected repositories are kalgebra, kgeography, kig, ktouch, and step.<br>
I have not checked marble yet, but I suspect it's affected as well.<br>
<br>
<br>
This is not just a matter of past history. The *current* revision of the<br>
repository contains bad data too. This is one of the reasons why the kdeedu<br>
4.6.3 release was delayed, and in the end was released from latest SVN<br>
instead of latest git.<br>
<br>
As an example, kalgebra.git/mobile/scripts/console/CMakeLists.txt in the 4.6<br>
branch differs from the one in SVN, because r1221940 was not converted.<br>
<br>
I will have to reconvert those repositories from SVN, rebase the changes<br>
that were done in git since the original migration, and do a force-push.<br>
Once that's done, you will have to reset your local branches to point to the<br>
new remote branches, or if you have local changes, rebase them on top of the<br>
new repository (NOT merge them). Of course, I'll post better instructions<br>
later, with exact git commands.<br>
<br>
<br>
I don't yet have a schedule for when this will happen. Feel free to suggest<br>
dates, for example to avoid doing it in the middle of a scheduled GSoC<br>
meeting/sprint/thing. It doesn't even need to happen for all five<br>
repositories at the same time.<br>
<br>
If you have any questions, reply to this message or ask in #kde-edu.<br>
<br>
Sorry for the trouble.<br>
<font color="#888888"><br>
--<br>
Nicolas<br>
<br>
<br>
_______________________________________________<br>
kde-edu mailing list<br>
<a href="mailto:kde-edu@mail.kde.org">kde-edu@mail.kde.org</a><br>
<a href="https://mail.kde.org/mailman/listinfo/kde-edu" target="_blank">https://mail.kde.org/mailman/listinfo/kde-edu</a><br>
</font></blockquote></div><br><div>Hi nicolás!</div><div>Thanks for your work and for noticing :). Tell me when you want to do that and I'll be extra cautious.</div><div><br></div><div>Aleix</div><div><br></div><div>
PS: As I said somewhere, I don't really care if the history is not the best in that part, so if you want just to apply a patch on top, it works for me also.</div>