<html><head></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; ">Avnee (one of our GSoC students) has had trouble setting up her scratch GIT repository<div>for the QML version of KDiamond.</div><div><br></div><div>Please can someone here help her. Stefan perhaps. Unfortunately I cannot: I do not</div><div>know enough about GIT. Details are forwarded below.</div><div><br></div><div>All the best, Ian W.<br><div><br><div>Begin forwarded message:</div><blockquote type="cite"><div style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px;"><span style="font-family:'Helvetica'; font-size:medium; color:rgba(0, 0, 0, 1.0);"><b>From: </b></span><span style="font-family:'Helvetica'; font-size:medium;">Avnee Nathani <<a href="mailto:avnee.nathani@gmail.com">avnee.nathani@gmail.com</a>><br></span></div><div style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px;"><span style="font-family:'Helvetica'; font-size:medium; color:rgba(0, 0, 0, 1.0);"><b>Subject: </b></span><span style="font-family:'Helvetica'; font-size:medium;"><b>Setting up scratch repo for kdiamond</b><br></span></div><div style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px;"><span style="font-family:'Helvetica'; font-size:medium; color:rgba(0, 0, 0, 1.0);"><b>Date: </b></span><span style="font-family:'Helvetica'; font-size:medium;">2 June 2012 2:17:04 AM AEST<br></span></div><div style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px;"><span style="font-family:'Helvetica'; font-size:medium; color:rgba(0, 0, 0, 1.0);"><b>To: </b></span><span style="font-family:'Helvetica'; font-size:medium;">Ian Wadham <<a href="mailto:iandw.au@gmail.com">iandw.au@gmail.com</a>><br></span></div><br><div>Hello Ian</div><div><br></div><div>Hope you are doing good. I have been trying to set up my scratch repository today, this is how it went,</div><div><br></div><div>According to Stefan ( in the thread, "GIT Conversion status"), I did the following:</div>
<div><br></div><div> mkdir git-kdiamond</div><div> cd git-kdiamond</div><div> git svn init svn://<a href="http://anonsvn.kde.org/home/kde/trunk/KDE/kdegames/kdiamond">anonsvn.kde.org/home/kde/trunk/KDE/kdegames/kdiamond</a></div>
<div> git svn fetch -r 1294007</div><div> git svn fetch</div><div> git svn rebase</div><div> git log</div><div><br></div><div>The log shows me [1]</div><div><br></div><div>Next what I did is,</div><div><br></div><div>
git remote add origin kde:scratch/nathani/kdiamond</div><div> git config branch.master.remote origin</div><div> git config branch.master.merge refs/heads/master</div><div> git push origin master</div><div><br></div>
<div>However, this is what I get [2]. I don't know what's going wrong here, I tried searching the web but no luck.</div><div>I followed the following techbase article,</div><div><a href="http://community.kde.org/Sysadmin/GitKdeOrgManual#Personal_scratch_repositories">http://community.kde.org/Sysadmin/GitKdeOrgManual#Personal_scratch_repositories</a></div>
<div><br></div><div>I see an empty repository "kdiamond" created on quickgit, here is the link,</div><div><a href="http://quickgit.kde.org/index.php?p=scratch%2Fnathani%2Fkdiamond.git&a=summary">http://quickgit.kde.org/index.php?p=scratch%2Fnathani%2Fkdiamond.git&a=summary</a></div>
<div><br></div><div>Please guide me further on this.</div><div><br></div><div>Thanks and regards</div><div>Avnee</div><div><br></div><div>==========================================================</div><div>[1] commit 71360941d1ab81839fc63a63be2ec3460e68961e</div>
<div>Author: majewsky <majewsky@283d02a7-25f6-0310-bc7c-ecb5cbfe19da></div><div>Date: Thu May 10 19:49:58 2012 +0000</div><div><br></div><div> Allow split build for all games except libkmahjongg dependencies.</div>
<div> </div><div> Most of this is straightforward. Some more complicated changes are in</div><div> 1. libkdegames: I needed to fix the headers <KgAudioScene> and</div><div> <KgSound>, which did not refer to the right include location when</div>
<div> installed.</div><div> 2. kgoldrunner: Its CMake code may not depend on OpenAL and libsndfile</div><div> anymore. KGoldRunner therefore now uses the new</div><div> <libkdegames_capabilities.h> header and enables sound only if</div>
<div> KGAUDIO_BACKEND_OPENAL is set.</div><div> </div><div> KMahjongg and KShisen are not done yet. I could not create a</div><div> config-script for KMahjongg because CMake currently gets confused over</div>
<div> exported targets in multiple source directories. (D'oh...)</div><div> </div><div> git-svn-id: svn://<a href="http://anonsvn.kde.org/home/kde/trunk/KDE/kdegames/kdiamond@1294007">anonsvn.kde.org/home/kde/trunk/KDE/kdegames/kdiamond@1294007</a> 283d02a7-25f6-0310-bc7c-ecb5cbfe19da</div>
<div>============================================================</div><div>[2] Initialized empty Git repository in /srv/kdegit/repositories/scratch/nathani/kdiamond.git/</div><div>Counting objects: 53, done.</div><div>Compressing objects: 100% (51/51), done.</div>
<div>Writing objects: 100% (53/53), 3.97 MiB | 50 KiB/s, done.</div><div>Total 53 (delta 3), reused 0 (delta 0)</div><div>remote: Audit failure - Commit 71360941d1ab81839fc63a63be2ec3460e68961e - Name - majewsky</div><div>
remote: Audit failure - Commit 71360941d1ab81839fc63a63be2ec3460e68961e - Name - majewsky</div><div>remote: Audit failure - Commit 71360941d1ab81839fc63a63be2ec3460e68961e - Email Address - majewsky@283d02a7-25f6-0310-bc7c-ecb5cbfe19da</div>
<div>remote: Audit failure - Commit 71360941d1ab81839fc63a63be2ec3460e68961e - Email Address - majewsky@283d02a7-25f6-0310-bc7c-ecb5cbfe19da</div><div>remote: Push declined - commits failed audit</div><div>remote: error: hook declined to update refs/heads/master</div>
<div>To git@git.kde.org:scratch/nathani/kdiamond</div><div> ! [remote rejected] master -> master (hook declined)</div><div>error: failed to push some refs to 'git@git.kde.org:scratch/nathani/kdiamond'</div><div>
============================================================</div>
</blockquote></div><br></div></body></html>