Hi,<br><br>The alternative I followed was:<div><br></div><div>1. Simply copy-paste the latest code from SVN into the empty Git repo</div><div>2. Add all of the code in the first commit, and tag that commit with "svn-import"</div>
<div>3. Push the commit and start working there of</div><div>4. Later when the Git repo for existing SVN code is ready, the commits from</div><div>the scratch repo can simply be "appended" to the converted Git repo</div>
<div><br></div><div>This worked for me, and I believe step-4 is well possible, so this approach is</div><div>not a bad idea, imo.</div><div><br><div class="gmail_quote">On Sat, Jun 2, 2012 at 7:01 AM, Frederik Schwarzer <span dir="ltr"><<a href="mailto:schwarzer@kde.org" target="_blank">schwarzer@kde.org</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Hi,<br>
<br>
let her ask the Sysadmins to disable the hooks for the scratch repo.<br>
Either on IRC (Freenode: #kde-sysadmin) or via a sysadmin request:<br>
<a href="https://bugs.kde.org/enter_sysadmin_request.cgi" target="_blank">https://bugs.kde.org/enter_sysadmin_request.cgi</a><br>
<br>
That should solve it.<br>
<br>
The problem is, that the email address is not correctly set during<br>
this kind of "transition" and thus is not Valid<br>
(majewsky@283d02a7-25f6-03[...]).<br>
<br>
Regards<br>
<br>
Am Samstag, 2. Juni 2012, 01:59:15 schrieb Ian Wadham:<br>
<div><div class="h5">> Avnee (one of our GSoC students) has had trouble setting up her<br>
> scratch GIT repository for the QML version of KDiamond.<br>
><br>
> Please can someone here help her. Stefan perhaps. Unfortunately I<br>
> cannot: I do not know enough about GIT. Details are forwarded<br>
> below.<br>
><br>
> All the best, Ian W.<br>
><br>
> Begin forwarded message:<br>
> > From: Avnee Nathani <<a href="mailto:avnee.nathani@gmail.com">avnee.nathani@gmail.com</a>><br>
> > Subject: Setting up scratch repo for kdiamond<br>
> > Date: 2 June 2012 2:17:04 AM AEST<br>
> > To: Ian Wadham <<a href="mailto:iandw.au@gmail.com">iandw.au@gmail.com</a>><br>
> ><br>
> > Hello Ian<br>
> ><br>
> > Hope you are doing good. I have been trying to set up my scratch<br>
> > repository today, this is how it went,<br>
> ><br>
> > According to Stefan ( in the thread, "GIT Conversion status"), I<br>
did the following:<br>
> > mkdir git-kdiamond<br>
> > cd git-kdiamond<br>
> > git svn init<br>
> > svn://<a href="http://anonsvn.kde.org/home/kde/trunk/KDE/kdegames/kdiamond" target="_blank">anonsvn.kde.org/home/kde/trunk/KDE/kdegames/kdiamond</a><br>
> > git svn fetch -r 1294007<br>
> > git svn fetch<br>
> > git svn rebase<br>
> > git log<br>
> ><br>
> > The log shows me [1]<br>
> ><br>
> > Next what I did is,<br>
> ><br>
> > git remote add origin kde:scratch/nathani/kdiamond<br>
> > git config branch.master.remote origin<br>
> > git config branch.master.merge refs/heads/master<br>
> > git push origin master<br>
> ><br>
> > However, this is what I get [2]. I don't know what's going wrong<br>
> > here, I tried searching the web but no luck. I followed the<br>
> > following techbase article,<br>
> > <a href="http://community.kde.org/Sysadmin/GitKdeOrgManual#Personal_scratc" target="_blank">http://community.kde.org/Sysadmin/GitKdeOrgManual#Personal_scratc</a><br>
> > h_repositories<br>
> ><br>
> > I see an empty repository "kdiamond" created on quickgit, here is<br>
> > the link,<br>
> > <a href="http://quickgit.kde.org/index.php?p=scratch%2Fnathani%2Fkdiamond" target="_blank">http://quickgit.kde.org/index.php?p=scratch%2Fnathani%2Fkdiamond</a><br>
> > .git&a=summary<br>
> ><br>
> > Please guide me further on this.<br>
> ><br>
> > Thanks and regards<br>
> > Avnee<br>
> ><br>
> > ==========================================================<br>
> > [1] commit 71360941d1ab81839fc63a63be2ec3460e68961e<br>
> > Author: majewsky <majewsky@283d02a7-25f6-0310-bc7c-ecb5cbfe19da><br>
> > Date: Thu May 10 19:49:58 2012 +0000<br>
> ><br>
> > Allow split build for all games except libkmahjongg<br>
> > dependencies.<br>
> ><br>
> > Most of this is straightforward. Some more complicated<br>
> > changes are in 1. libkdegames: I needed to fix the headers<br>
> > <KgAudioScene> and<br>
> ><br>
> > <KgSound>, which did not refer to the right include<br>
> > location when installed.<br>
> ><br>
> > 2. kgoldrunner: Its CMake code may not depend on OpenAL and<br>
> > libsndfile<br>
> ><br>
> > anymore. KGoldRunner therefore now uses the new<br>
> > <libkdegames_capabilities.h> header and enables sound only<br>
> > if KGAUDIO_BACKEND_OPENAL is set.<br>
> ><br>
> > KMahjongg and KShisen are not done yet. I could not create a<br>
> > config-script for KMahjongg because CMake currently gets<br>
> > confused over exported targets in multiple source<br>
> > directories. (D'oh...)<br>
> ><br>
> > git-svn-id:<br>
> > svn://<a href="http://anonsvn.kde.org/home/kde/trunk/KDE/kdegames/kdiamond@1" target="_blank">anonsvn.kde.org/home/kde/trunk/KDE/kdegames/kdiamond@1</a><br>
> > 294007 283d02a7-25f6-0310-bc7c-ecb5cbfe19da<br>
> ><br>
> > ============================================================<br>
> > [2] Initialized empty Git repository in<br>
> > /srv/kdegit/repositories/scratch/nathani/kdiamond.git/ Counting<br>
> > objects: 53, done.<br>
> > Compressing objects: 100% (51/51), done.<br>
> > Writing objects: 100% (53/53), 3.97 MiB | 50 KiB/s, done.<br>
> > Total 53 (delta 3), reused 0 (delta 0)<br>
> > remote: Audit failure - Commit<br>
> > 71360941d1ab81839fc63a63be2ec3460e68961e - Name - majewsky<br>
> > remote: Audit failure - Commit<br>
> > 71360941d1ab81839fc63a63be2ec3460e68961e - Name - majewsky<br>
> > remote: Audit failure - Commit<br>
> > 71360941d1ab81839fc63a63be2ec3460e68961e - Email Address -<br>
> > majewsky@283d02a7-25f6-0310-bc7c-ecb5cbfe19da remote: Audit<br>
> > failure - Commit 71360941d1ab81839fc63a63be2ec3460e68961e -<br>
> > Email Address - majewsky@283d02a7-25f6-0310-bc7c-ecb5cbfe19da<br>
> > remote: Push declined - commits failed audit<br>
> > remote: error: hook declined to update refs/heads/master<br>
> > To git@git.kde.org:scratch/nathani/kdiamond<br>
> ><br>
> > ! [remote rejected] master -> master (hook declined)<br>
> ><br>
> > error: failed to push some refs to<br>
> > 'git@git.kde.org:scratch/nathani/kdiamond'<br>
> > ============================================================<br>
<br>
</div></div>_______________________________________________<br>
kde-games-devel mailing list<br>
<a href="mailto:kde-games-devel@kde.org">kde-games-devel@kde.org</a><br>
<a href="https://mail.kde.org/mailman/listinfo/kde-games-devel" target="_blank">https://mail.kde.org/mailman/listinfo/kde-games-devel</a><br>
</blockquote></div><br></div>