[Kde-games-devel] GIT Conversion status

[Stefan Majewsky]

On Fri, May 11, 2012 at 11:04 AM, Ian Wadham <iandw.au at gmail.com> wrote:
> At some point, I hope Stefan will reveal the mysteries of a "three-point
> rebase", whatever that is, and we will be able to merge your work back into
> mainstream KBreakout.  Please work with this future merge in mind.

The three-point rebase is not magic at all, it's detailed in `man
git-rebase`. Anyway, we're far from this point.

Okay, here's what to do from the student's POV. Replace $GAME by your
game name. Also, before you begin, look up the current head revision
of KDE SVN (e.g. in the "Directory revision" field on websvn.kde.org).
Store in $REVISION.

    mkdir git-$GAME
    cd git-$GAME
    git svn init svn://anonsvn.kde.org/home/kde/trunk/KDE/kdegames/$GAME
    git svn fetch -r $REVISION
    git svn fetch
    git svn rebase
    git log

The log should show that your master contains exactly one revision,
and the directory should contain a checkout of kdiamond (or whatever).

    git remote add origin kde:scratch/$YOURNAME/gsoc2012-$GAME
    git config branch.master.remote origin
    git config branch.master.merge refs/heads/master
    git push origin master

This pushes to and thus creates the scratch repository in which you
will be working. The first three lines are so that the repo is left in
the same state which "git clone" from the scratch repo would setup.

    git tag svn-import master
    git push --tags origin

These two commands mark with a tag the revision which you imported
from SVN, so you can easily reference it in future operations. I might
rely on this tag being available in future workflow explanations.

As I said in another thread a few minutes ago, split build is enabled
on all games except KMahjongg and KShisen, so the build should work
fine, provided that your compiled and installed libkdegames is not
older than May 10.

If you have a checkout of whole kdegames, you might run into problems
if you install $GAME both there and in this separate source tree. To
disable the build of your game in the kdegames source tree, do the
following there (in the build directory).

    sudo make uninstall
    cmake -DBUILD_$GAME=OFF .
    sudo make install

Note that $GAME is in lower-case, e.g. "-DBUILD_kdiamond=OFF". The
uninstall/install makes sure that no installed files of $GAME are left
by this build directory.

Greetings
Stefan